From e784ca3da35216564daf2af8d1cbd4c3a909f377 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 15 Apr 2021 10:29:04 +0800
Subject: [PATCH] 20210415v1.5

---
 .../java/com/ccsens/tall/service/ExcelService.java     |  2 +-
 .../com/ccsens/tall/service/WbsSubSheetService.java    | 10 +++++-----
 2 files changed, 6 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 fc4f6904..c8e9a01c 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@@ -530,7 +530,7 @@ public class ExcelService implements IExcelService {
                 }
                 //TODO 判断手机号格式
                 String regex ="^[1]([3-9])[0-9]{9}$";
-                if (StrUtil.isNotEmpty(phoneCell) || !phoneCell.matches(regex)){
+                if (StrUtil.isEmpty(phoneCell) || !phoneCell.matches(regex)){
                     throw new BaseException(CodeEnum.WBS_PHONE_ERROR.addMsg(memberSheet.getSheetName(),(i+1),memberCell));
                 }
 
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 9d28229d..223e11c6 100644
--- a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java
@@ -121,12 +121,12 @@ public class WbsSubSheetService implements IWbsSubSheetService {
                                             }
                                         }
                                         if (ObjectUtil.isNull(proMemberId)) {
-                                            throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a));
+                                            throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName(),a+1));
                                         }
                                     }
                                 }
                             } else {
-                                throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a));
+                                throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName(),a+1));
                             }
                         }
                     }
@@ -225,7 +225,7 @@ public class WbsSubSheetService implements IWbsSubSheetService {
                                     }
                                 }
                                 if (ObjectUtil.isNull(proMemberId)) {
-                                    throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a));
+                                    throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName(),a+1));
                                 }
                             }
                         }
@@ -553,7 +553,7 @@ public class WbsSubSheetService implements IWbsSubSheetService {
                                 sysProjectRobotMessage.setAllMessage((byte) 0);
                                 projectRobotMessageDao.insertSelective(sysProjectRobotMessage);
                             }else {
-                                throw new BaseException(CodeEnum.NOT_MESSAGE_TYPE.addMsg(robotSheet.getSheetName() + i));
+                                throw new BaseException(CodeEnum.NOT_MESSAGE_TYPE.addMsg(robotSheet.getSheetName(),i+1));
                             }
                         }
                     }else {
@@ -583,7 +583,7 @@ public class WbsSubSheetService implements IWbsSubSheetService {
                     if (StrUtil.isNotEmpty(relevanceProjectId)) {
                         SysProject sysProject = sysProjectDao.selectByPrimaryKey(Long.valueOf(relevanceProjectId));
                         if (ObjectUtil.isNull(sysProject)) {
-                            throw new BaseException(CodeEnum.NOT_PROJECT.addMsg("关联项目表" + i));
+                            throw new BaseException(CodeEnum.NOT_PROJECT.addMsg("关联项目表",i+1));
                         }
                         SysRelevanceProject sysRelevanceProject = new SysRelevanceProject();
                         sysRelevanceProject.setId(snowflake.nextId());