From 909de971e11f0bd0e571be69daead7491184f0a9 Mon Sep 17 00:00:00 2001
From: "castle.zang" <loveCode1314>
Date: Mon, 10 May 2021 11:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=20UAT-=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=2015179?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/busi/PersonnelController.java |  5 +++--
 .../serviceimpl/busi/PersonnelServiceService.java       | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 9a2fbbb..b94ba19 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
@@ -689,10 +689,11 @@ public class PersonnelController extends CoreBaseController {
                 .notNull("infoPositionId", model.getInfoPositionId())
                 .notNull("infoDepartmentId", model.getInfoDepartmentId())
                 .notNull("userDepartmentId", model.getUserDepartmentId())
-                .notNull("userLoginName", model.getUserLoginName())
+                .notNull("userLoginName", model.getUserLoginName());
                 // FIXME 松下移除邮箱校验
 //                .notNull("userEmail", model.getUserEmail())
-                .notNull("userPhone", model.getUserPhone());
+                // FIXME 松下移除手机号校验
+//               .notNull("userPhone", model.getUserPhone());
     }
 
     /**
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
index 07e7978..4c9749e 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
@@ -650,14 +650,15 @@ public class PersonnelServiceService implements IPersonnelService {
 //            }
 
             // 手机号唯一教研
-            if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                        .setErrorDetail("手机号已存在")
-                        .setErrorSolution("请重新输入手机号")
-                        .build();
-            }
+            //FIXME 松下移除唯一校验
+//            if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
+//                throw ImppExceptionBuilder.newInstance()
+//                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+//                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+//                        .setErrorDetail("手机号已存在")
+//                        .setErrorSolution("请重新输入手机号")
+//                        .build();
+//            }
 
             // 工号唯一教研
             if(!checkSysUserEmpNo(user.getUserEmpNo(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){