Merge branch 'dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/ExternalSystemController.java

@@ -151,9 +151,10 @@ public class ExternalSystemController {
             case USER_EMP_NO:
                 userBindPropertyValue = sysUser.getUserEmpNo();
                 break;
-            case EMAIL:
-                userBindPropertyValue =sysUser.getUserEmail();
-                break;
+            //FIXME 松下取消邮箱校验
+//            case EMAIL:
+//                userBindPropertyValue =sysUser.getUserEmail();
+//                break;
             case USER_PHONE:
                 userBindPropertyValue = sysUser.getUserPhone();
                 break;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -81,7 +81,8 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.beginValid(sysUser)
                             .numberCheck("userInfoId",sysUser.getUserInfoId())
                             .notNull("userLoginName",sysUser.getUserLoginName())
-                            .notNull("userEmail",sysUser.getUserEmail())
+                    // FIXME 松下取消邮箱校验
+//                            .notNull("userEmail",sysUser.getUserEmail())
                             .notNull("userLoginPassword",sysUser.getUserLoginPassword());
 
             if(roleIds == null || roleIds.length <= 0){
@@ -143,8 +144,9 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.beginValid(sysUser)
                     .numberCheck("id",sysUser.getUserInfoId())
                     .numberCheck("userInfoId",sysUser.getUserInfoId())
-                    .notNull("userLoginName",sysUser.getUserLoginName())
-                    .notNull("userEmail",sysUser.getUserEmail());
+                    .notNull("userLoginName",sysUser.getUserLoginName());
+            // FIXME 松下取消邮箱校验
+//                    .notNull("userEmail",sysUser.getUserEmail());
 
             if(roleIds == null || roleIds.length <= 0){
                 throw ImppExceptionBuilder.newInstance()

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java

@@ -137,7 +137,10 @@ public class MessageMailQueueReceiver {
 
                     for (String receiver : messageReceiver) {
                         sysUser = sysUserService.getSysUserById(Long.parseLong(receiver));
-
+                        // FIXME 松下取消邮件唯一性
+                        if (StringUtils.isEmpty(sysUser.getUserEmail())) {
+                            continue;
+                        }
                         refUserMessage = new SysRefUserMessage();
                         refUserMessage.setMessageId(msg.getId());
                         refUserMessage.setMessageSoftType(msg.getMessageSoftType());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -639,14 +639,15 @@ public class PersonnelServiceService implements IPersonnelService {
             }
 
             // 邮箱唯一教研
-            if(!checkSysUserEmail(user.getUserEmail(),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(!checkSysUserEmail(user.getUserEmail(),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(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -590,14 +590,15 @@ public class SysUserService implements ISysUserService {
             }
 
             // 登录名唯一教研
-            if (!checkSysUserEmail(user.getUserEmail(), user.getId() == null ? 0 : user.getId())) {
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                        .setErrorDetail("邮箱已存在")
-                        .setErrorSolution("请重新输入邮箱")
-                        .build();
-            }
+            // FIXME 松下移除用户邮箱
+//            if (!checkSysUserEmail(user.getUserEmail(), user.getId() == null ? 0 : user.getId())) {
+//                throw ImppExceptionBuilder.newInstance()
+//                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+//                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+//                        .setErrorDetail("邮箱已存在")
+//                        .setErrorSolution("请重新输入邮箱")
+//                        .build();
+//            }
 
             // 登录名唯一教研
             if (!checkSysUserPhone(user.getUserPhone(), user.getId() == null ? 0 : user.getId())) {