From 66007b4c5c0df68afce50d802f343559f89093c0 Mon Sep 17 00:00:00 2001
From: tianea <tianxyy80@gmail.com>
Date: Wed, 29 Mar 2023 20:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../platform/competitiion/pc/biz/TeamMemberImportBiz.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
index 3d602a4..d1ffc62 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
@@ -82,6 +82,7 @@ public class TeamMemberImportBiz {
String className = StringUtils.trimAllWhitespace(team.getClassName());
String province =StringUtils.trimAllWhitespace(team.getProvince());
String level = StringUtils.trimAllWhitespace(team.getLevel());
+ if(team.getStudentNo() == null ) {continue;}
String studentNo = StringUtils.trimAllWhitespace(dealStudentNo(team.getStudentNo()));
boolean exsit = false;
MemberImport memberImport = neesSave.stream().filter(memberImport1 -> memberImport1.getStudentNo().equals(studentNo)).findFirst().orElse(null);
@@ -205,7 +206,9 @@ public class TeamMemberImportBiz {
public String filter(String str) {
-
+ if(str == null){
+ return "";
+ }
if(str.trim().isEmpty()){
return str;
}
@@ -219,9 +222,6 @@ public class TeamMemberImportBiz {
private String dealStudentNo(String studentNo){
- if(studentNo==null){
- return "";
- }
studentNo =studentNo.trim();
if(studentNo.contains("'")){
studentNo = studentNo.replace("'","");