修复批量导入空数据导致导入不成功的bug

master
tianea 2 years ago
parent 605c750857
commit 66007b4c5c

@ -82,6 +82,7 @@ public class TeamMemberImportBiz {
String className = StringUtils.trimAllWhitespace(team.getClassName()); String className = StringUtils.trimAllWhitespace(team.getClassName());
String province =StringUtils.trimAllWhitespace(team.getProvince()); String province =StringUtils.trimAllWhitespace(team.getProvince());
String level = StringUtils.trimAllWhitespace(team.getLevel()); String level = StringUtils.trimAllWhitespace(team.getLevel());
if(team.getStudentNo() == null ) {continue;}
String studentNo = StringUtils.trimAllWhitespace(dealStudentNo(team.getStudentNo())); String studentNo = StringUtils.trimAllWhitespace(dealStudentNo(team.getStudentNo()));
boolean exsit = false; boolean exsit = false;
MemberImport memberImport = neesSave.stream().filter(memberImport1 -> memberImport1.getStudentNo().equals(studentNo)).findFirst().orElse(null); 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) { public String filter(String str) {
if(str == null){
return "";
}
if(str.trim().isEmpty()){ if(str.trim().isEmpty()){
return str; return str;
} }
@ -219,9 +222,6 @@ public class TeamMemberImportBiz {
private String dealStudentNo(String studentNo){ private String dealStudentNo(String studentNo){
if(studentNo==null){
return "";
}
studentNo =studentNo.trim(); studentNo =studentNo.trim();
if(studentNo.contains("'")){ if(studentNo.contains("'")){
studentNo = studentNo.replace("'",""); studentNo = studentNo.replace("'","");

Loading…
Cancel
Save