diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 348bbc9..a8dbccc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -223,6 +223,21 @@ public class SysUserController extends BaseController return toAjax(userService.deleteUserByIds(userIds)); } + /** + * 根据考核任务id删除用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:remove')") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/pcIds/{pcIds}") + public AjaxResult removeBypcIds(@PathVariable Long[] pcIds) + { + if (ArrayUtils.contains(pcIds, getUserId())) + { + return error("当前用户不能删除"); + } + return toAjax(userService.deleteUserByPcIds(pcIds)); + } + /** * 重置密码 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 7a5b679..54ddaed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -203,4 +203,6 @@ public interface ISysUserService * @return 结果 */ public String importUser(List userList, Boolean isUpdateSupport, String operName); + + int deleteUserByPcIds(Long[] pcIds); } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index f3a4dca..feb170a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -237,5 +237,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userId} - + + update sys_user set del_flag = '2' where pc_id in + + #{pcId} + + + \ No newline at end of file