Merge branch 'dev' into test

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

@@ -1,6 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.*;
+import cn.estsh.i3plus.core.api.iservice.busi.ILicenseClickService;
+import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
@@ -29,7 +35,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -677,7 +690,8 @@ public class PersonnelController extends CoreBaseController {
                 .notNull("infoDepartmentId", model.getInfoDepartmentId())
                 .notNull("userDepartmentId", model.getUserDepartmentId())
                 .notNull("userLoginName", model.getUserLoginName())
-                .notNull("userEmail", model.getUserEmail())
+                // FIXME 松下移除邮箱校验
+//                .notNull("userEmail", model.getUserEmail())
                 .notNull("userPhone", model.getUserPhone());
     }