|
|
@ -401,8 +401,10 @@ public class ExcelService implements IExcelService { |
|
|
|
|
|
|
|
String regex = ",|,|;|;|、|/"; |
|
|
|
String[] split = memberCell.split(regex); |
|
|
|
String memberName =""; |
|
|
|
for (int j = 0; j < split.length; j++) { |
|
|
|
ProMemberRole memberRole = null; |
|
|
|
memberName = split[j]; |
|
|
|
for (ProMember member : proMembers) { |
|
|
|
if (split[j].equalsIgnoreCase(member.getNickname())) { |
|
|
|
memberRole = new ProMemberRole(); |
|
|
@ -414,7 +416,7 @@ public class ExcelService implements IExcelService { |
|
|
|
} |
|
|
|
} |
|
|
|
if (ObjectUtil.isNull(memberRole)) { |
|
|
|
throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(wbsSheet.getSheetName() + (i+1))); |
|
|
|
throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsgAndMemberName(wbsSheet.getSheetName() + (i+1),memberName)); |
|
|
|
} |
|
|
|
} |
|
|
|
// ProMemberRole memberRole = null;
|
|
|
@ -467,7 +469,9 @@ public class ExcelService implements IExcelService { |
|
|
|
} |
|
|
|
|
|
|
|
if (ObjectUtil.isNotNull(excludeRoleCells)) { |
|
|
|
String noLookName = ""; |
|
|
|
for (int a = 0; a < excludeRoleCells.length; a++) { |
|
|
|
noLookName = excludeRoleCells[a]; |
|
|
|
ProRoleExclude excludeRole = new ProRoleExclude(); |
|
|
|
excludeRole.setId(snowflake.nextId()); |
|
|
|
excludeRole.setRoleId(proRoleId); |
|
|
@ -481,7 +485,7 @@ public class ExcelService implements IExcelService { |
|
|
|
} |
|
|
|
} |
|
|
|
if (ObjectUtil.isNull(roleId)) { |
|
|
|
throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName() + (i+1))); |
|
|
|
throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsgAndNoLookName(wbsSheet.getSheetName() + (i+1),noLookName)); |
|
|
|
} |
|
|
|
} |
|
|
|
excludeRoleService.saveExcludeRole(excludeRole); |
|
|
|