Althars123 2 rokov pred
rodič
commit
5773b194b6

+ 20 - 20
xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -138,18 +138,18 @@ public class SysUserController extends BaseController
     @ApiOperation("新增用户")
     public Response<Integer> add(@Validated @RequestBody SysUser user)
     {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
-            return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
-        }
+//        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+//        {
+//            return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
+//        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toResponse(userService.insertUser(user));
@@ -165,14 +165,14 @@ public class SysUserController extends BaseController
     public Response<Integer> edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
-        }
+//        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
+//        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(userService.updateUser(user));
     }

+ 4 - 4
xxgl-system/src/main/java/com/miaxis/system/service/impl/SysUserServiceImpl.java

@@ -212,7 +212,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
-        insertUserPost(user);
+        //insertUserPost(user);
         // 新增用户与角色管理
         insertUserRole(user);
         return rows;
@@ -234,9 +234,9 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
-        // 新增用户与岗位管理
-        insertUserPost(user);
+//        userPostMapper.deleteUserPostByUserId(userId);
+//        // 新增用户与岗位管理
+//        insertUserPost(user);
         return userMapper.updateUser(user);
     }