UAT-用户管理优化修改 15179

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());
     }
 
     /**

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())){