From 34f53a3bd4df2bfd170db8683f9d644b0fe5f616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Wed, 1 Jun 2022 20:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/maku/system/controller/SysUserController.java | 5 +++++ fast-boot-system/src/main/resources/mapper/SysMenuDao.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java b/fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java index 57bc9da..5abafe7 100644 --- a/fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java +++ b/fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java @@ -128,6 +128,11 @@ public class SysUserController { @Operation(summary = "删除") @PreAuthorize("hasAuthority('sys:user:delete')") public Result delete(@RequestBody List idList){ + Long userId = SecurityUser.getUserId(); + if(idList.contains(userId)){ + return Result.error("不能删除当前登录用户"); + } + sysUserService.delete(idList); return Result.ok(); diff --git a/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml b/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml index 4fcb085..d15eead 100644 --- a/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml +++ b/fast-boot-system/src/main/resources/mapper/SysMenuDao.xml @@ -15,7 +15,7 @@ select t3.* from sys_user_role t1 left join sys_role_menu t2 on t1.role_id = t2.role_id left join sys_menu t3 on t2.menu_id = t3.id - where t1.user_id = #{userId} and t1.deleted = 0 and t3.deleted = 0 + where t1.user_id = #{userId} and t1.deleted = 0 and t2.deleted = 0 and t3.deleted = 0 and t3.type = #{type} @@ -26,7 +26,7 @@ select t3.authority from sys_user_role t1 left join sys_role_menu t2 on t1.role_id = t2.role_id left join sys_menu t3 on t2.menu_id = t3.id - where t1.user_id = #{userId} and t1.deleted = 0 and t3.deleted = 0 order by t3.sort asc + where t1.user_id = #{userId} and t1.deleted = 0 and t2.deleted = 0 and t3.deleted = 0 order by t3.sort asc