删除

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -130,8 +130,4 @@ public class SysDeptController extends BaseController
         return toAjax(deptService.deleteDeptById(deptId));
     }
 
-    /**
-     * 获取当前账号的下拉部门树
-     */
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -183,7 +183,6 @@ public class SysRoleController extends BaseController
     /**
      * 获取角色选择框列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -360,4 +360,15 @@ public class SysUserController extends BaseController
         return success(deptService.selectDeptTreeList(user.getDept()));
     }
 
+    /***
+     * 删除人员（把人员重置为初始状态，角色为普通用户，部门为空）
+     */
+    @GetMapping("/reset")
+    public AjaxResult reset(Long id)
+    {
+
+        return toAjax(userService.reset(id));
+    }
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -222,4 +222,6 @@ public interface ISysUserService
     AjaxResult query(SysUser user);
 
     AjaxResult allocationOne(String phonenumber);
+
+    int reset(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -642,4 +642,25 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return AjaxResult.success("该人员不存在或该人员已分配部门");
     }
+
+    @Override
+    public int reset(Long id) {
+
+        // 重置用户与角色关联（先删后新增）
+        userRoleMapper.deleteUserRoleByUserId(id);
+        List<SysUserRole> list = new ArrayList<SysUserRole>();
+        SysUserRole ur = new SysUserRole();
+        ur.setUserId(id);
+        ur.setRoleId(2L);
+        list.add(ur);
+        userRoleMapper.batchUserRole(list);
+        // 删除用户与岗位关联
+        userPostMapper.deleteUserPostByUserId(id);
+        //将deptId置0
+        //修改人员应答状态
+        SysUser applyForUser = new SysUser();
+        applyForUser.setUserId(id);
+        applyForUser.setDeptId(0L);
+        return userMapper.updateUser(applyForUser);
+    }
 }