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("'","");