删除用户增加限制

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -105,6 +105,7 @@ public enum ResultStatus {
 
     EXSIT_IS_PARENT_ERROR(800001,"存在下级信息不能删除"),
     EXSIT_IS_DICTCODE_ERROR(800002,"存在相同字典编码不能新增"),
+    EXSIT_IS_ACCOUNT_ERROR(800003,"登录用户不能删除当前登录用户信息"),
 
     SYSTEM_ERROR(999999, "系统错误"),
     PARAM_ERROR(700001, "参数缺失"),

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -51,10 +51,10 @@ public class UserController {
 
     @ApiOperation(value = "分页查询用户信息(按参数)")
     @RequestMapping(value = "/selectPageByParm", method = RequestMethod.POST)
-    public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@RequestParam(value = "contion",required = false) String contion,@RequestParam(value = "deptId",required = false) Long deptId) {
+    public AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam(value = "contion", required = false) String contion, @RequestParam(value = "deptId", required = false) Long deptId) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
-        UserEntity  userEntity = new UserEntity();
-        if(contion!=null&&contion!="") {
+        UserEntity userEntity = new UserEntity();
+        if (contion != null && contion != "") {
             userEntity.setUsername(contion.trim());
             userEntity.setPhone(contion.trim());
         }
@@ -65,59 +65,65 @@ public class UserController {
         Pagination<UserEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
     @ApiOperation(value = "分页查询用户信息")
     @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
-    public  AjaxMessage<Pagination<UserEntity>> selectPageByParm(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "", required = false)@RequestBody UserEntity userEntity) {
+    public AjaxMessage<Pagination<UserEntity>> selectPageByParm(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam(value = "", required = false) @RequestBody UserEntity userEntity) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         iPage = userService.findPage(iPage, userEntity);
         Pagination<UserEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
     /**
      * 查询
      */
     @ApiOperation(value = "获取当前登录用户信息")
     @RequestMapping(value = "/findLoginUserById", method = RequestMethod.POST)
-    public  AjaxMessage<UserEntity>  findLoginUserById() {
+    public AjaxMessage<UserEntity> findLoginUserById() {
         LoginUser currentUser = UserUtil.getCurrentUser();
         UserEntity userEntity = userService.findUserById(Long.valueOf(currentUser.getId()));
         return new AjaxMessage<>(ResultStatus.OK, userEntity);
     }
+
     /**
      * 查询
      */
     @ApiOperation(value = "按ID查询用户信息")
     @RequestMapping(value = "/findUserById", method = RequestMethod.POST)
-    public  AjaxMessage<UserEntity>  findUserById(@ApiParam(value = "用户ID", required = true) @RequestParam Long id) {
+    public AjaxMessage<UserEntity> findUserById(@ApiParam(value = "用户ID", required = true) @RequestParam Long id) {
         UserEntity userEntity = userService.findUserById(id);
         return new AjaxMessage<>(ResultStatus.OK, userEntity);
     }
+
     /**
      * 按用户查询一级菜单信息(入口菜单)
      */
     @ApiOperation(value = "查询用户一级菜单信息(入口菜单-用户)")
     @RequestMapping(value = "/findUserFirstMenu", method = RequestMethod.GET)
-    public  AjaxMessage<List<MenuEntity>>  findUserFirstMenu() {
+    public AjaxMessage<List<MenuEntity>> findUserFirstMenu() {
 
         List<MenuEntity> menuEntityList = menuService.findUserFirstMenu();
         return new AjaxMessage<>(ResultStatus.OK, menuEntityList);
     }
+
     /**
      * 按应用查询菜单信息(系统菜单-用户)
      */
     @ApiOperation(value = "查询应用菜单信息")
     @RequestMapping(value = "/findUserMenu", method = RequestMethod.GET)
-    public  AjaxMessage<List<MenuEntity>>  findUserMenu(@ApiParam(value = "应用ID", required = true) @RequestParam String appId) {
+    public AjaxMessage<List<MenuEntity>> findUserMenu(@ApiParam(value = "应用ID", required = true) @RequestParam String appId) {
         List<MenuEntity> menuEntityList = menuService.findUserMenu(appId);
         return new AjaxMessage<>(ResultStatus.OK, menuEntityList);
     }
+
     /**
      * 新增
      */
     @ApiOperation(value = "用户头像")
     @RequestMapping(value = "addUserPhoto", method = RequestMethod.POST)
     @ResponseBody
-    public  AjaxMessage<String>  addUserPhoto(@ApiParam(value = "用户头像", required = true)@RequestParam("avatarfile") MultipartFile file) {
+    public AjaxMessage<String> addUserPhoto(@ApiParam(value = "用户头像", required = true) @RequestParam("avatarfile") MultipartFile file) {
         String avatar = "";
         if (!file.isEmpty()) {
             try {
@@ -136,7 +142,7 @@ public class UserController {
     @ApiOperation(value = "新增用户信息")
     @RequestMapping(value = "addUser", method = RequestMethod.POST)
     @ResponseBody
-    public  AjaxMessage<Integer>  addUser( @ApiParam(value = "用户信息", required = true)@RequestBody  UserEntity user) {
+    public AjaxMessage<Integer> addUser(@ApiParam(value = "用户信息", required = true) @RequestBody UserEntity user) {
         if (user.getPhone() != null) {
             boolean isExsit = userService.checkMobileUnique(user.getPhone());
             if (isExsit) {
@@ -144,7 +150,7 @@ public class UserController {
             }
         }
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if(currentUser!=null) {
+        if (currentUser != null) {
             user.setUpdateBy(currentUser.getUsername());
             user.setCreateBy(currentUser.getUsername());
             user.setDateCreate(new Date());
@@ -163,7 +169,7 @@ public class UserController {
     @ApiOperation(value = "更新用户信息")
     @RequestMapping(value = "/updateUserById", method = RequestMethod.POST)
     @ResponseBody
-    public AjaxMessage<Integer> editUser(@ApiParam(value = "用户信息", required = true) @RequestBody  UserEntity user) {
+    public AjaxMessage<Integer> editUser(@ApiParam(value = "用户信息", required = true) @RequestBody UserEntity user) {
         if (user.getPhone() != null) {
             boolean isExsit = userService.checkMobileUnique(user);
             if (isExsit) {
@@ -171,7 +177,7 @@ public class UserController {
             }
         }
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if(currentUser!=null) {
+        if (currentUser != null) {
             user.setUpdateBy(currentUser.getUsername());
             user.setDateUpdate(new Date());
             user.setTenantId(currentUser.getTenantId());
@@ -188,9 +194,20 @@ public class UserController {
     @RequestMapping(value = "/deleteUserByIds", method = RequestMethod.POST)
     @ResponseBody
     public AjaxMessage<Integer> deleteUserByIds(@ApiParam(value = "用户ID", required = true) @RequestBody Long[] ids) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        Integer userId = currentUser.getId();
+        boolean isOk = true;
+        for (Long id : ids) {
+            if (userId.toString().equals(id.toString())) {
+                isOk = false;
+            }
+        }
+        if (!isOk)
+            return new AjaxMessage<>(ResultStatus.EXSIT_IS_ACCOUNT_ERROR, 0);
         int result = userService.delUserByIds(ids) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+
     /**
      * 删除
      */
@@ -198,7 +215,13 @@ public class UserController {
     @ApiOperation(value = "按ID进行单个删除")
     @RequestMapping(value = "/deleteUserById", method = RequestMethod.POST)
     @ResponseBody
-    public AjaxMessage<Integer> deleteUserById(@ApiParam(value = "用户ID", required = true)@RequestParam Long id) {
+    public AjaxMessage<Integer> deleteUserById(@ApiParam(value = "用户ID", required = true) @RequestParam Long id) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        Integer userId = currentUser.getId();
+        System.out.println("userId"+userId);
+        if (userId.toString().equals(id.toString())) {
+            return new AjaxMessage<>(ResultStatus.EXSIT_IS_ACCOUNT_ERROR, 0);
+        }
         int result = userService.delUserById(id) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }