From a31ededd2f2bc305f5cf08c63bc524adb967ef34 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 15 Apr 2021 10:19:03 +0800
Subject: [PATCH] 20210415v1.2

---
 .../java/com/ccsens/tall/service/ExcelService.java    | 11 +++++++----
 .../com/ccsens/tall/service/WbsSubSheetService.java   |  2 +-
 util/src/main/java/com/ccsens/util/CodeEnum.java      |  2 +-
 3 files changed, 9 insertions(+), 6 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 0c03d1f8..247b5015 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@@ -520,8 +520,8 @@ public class ExcelService implements IExcelService {
                 String stakeholderPhoneCell = ExcelUtil.getCellValue(row.getCell(4));
                 ProMember stakeholder = null;
                 ProMember member;
-                //所有值都为空，跳至下一循环
-                if ((StrUtil.isEmpty(memberCell) && StrUtil.isEmpty(phoneCell))) {
+                //成员名为空，跳至下一行
+                if ((StrUtil.isEmpty(memberCell))) {
                     continue;
                 }
                 //手机号不能为空
@@ -531,8 +531,11 @@ public class ExcelService implements IExcelService {
                 }
                 //TODO 判断手机号格式
                 String regex ="^[1]([3-9])[0-9]{9}$";
-                if (!phoneCell.matches(regex)){
-                    throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName() + (i+1)));
+                if (StrUtil.isNotEmpty(phoneCell) || !phoneCell.matches(regex)){
+                    throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName(),(i+1),memberCell));
+                }
+                if (StrUtil.isNotEmpty(stakeholderPhoneCell) || !stakeholderPhoneCell.matches(regex)){
+                    throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName(),(i+1),stakeholderCell));
                 }
                 //添加奖惩干系人
                 if (StrUtil.isNotEmpty(stakeholderCell)) {
diff --git a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java
index 81176756..9d28229d 100644
--- a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java
@@ -447,7 +447,7 @@ public class WbsSubSheetService implements IWbsSubSheetService {
                         }
                     }
                     if (taskId == null) {
-                        throw new BaseException(CodeEnum.NOT_TASK + ":" + taskName);
+                        throw new BaseException(CodeEnum.NOT_TASK.addMsg(pluginConfigSheet.getSheetName(),(i+1),taskName));
                     }
                     //获取插件id
                     Long pluginId = 0L;
diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java
index ebb303cb..294f79bc 100644
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@@ -52,7 +52,7 @@ public enum  CodeEnum {
     NOT_PROJECT(36,"对不起，找不到该项目",true),
     NOT_ROLE(37,"对不起，找不到该角色",true),
     NOT_DELIVER(38,"对不起，找不到对应的交付物",true),
-    NOT_TASK(39,"对不起，找不到对应的任务",true),
+    NOT_TASK(39,"找不到对应的任务",true),
     NOT_DELIVER_FILE(40,"文件信息错误，请重试",true),
     IS_NOT_EXECUTOR(41,"对不起，您不是该任务负责人",true),
     NOT_CHECKER(42,"请选择检查人",true),