diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 6d6b4b29..86f60e1f 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -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); diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 49681ea5..4b3bd56a 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -232,6 +232,14 @@ public enum CodeEnum { this.msg = msg+"行:"+this.msg; return this; } + public CodeEnum addMsgAndMemberName(String msg,String memberName){ + this.msg = msg+"行:成员["+memberName+"]"+this.msg; + return this; + } + public CodeEnum addMsgAndNoLookName(String msg,String noLookName){ + this.msg = msg+"行:对谁不可见成员["+noLookName+"]"+this.msg; + return this; + } public CodeEnum notProject(String msg) { this.msg = msg + "找不到项目信息"; return this;