From 515d047154f9a0208837065514d5af91c272d87a Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Wed, 14 Apr 2021 17:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5wbs?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/tall/service/ExcelService.java   | 8 ++++++--
 util/src/main/java/com/ccsens/util/CodeEnum.java          | 8 ++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

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;