From 20f1d58386f74f7f8fb14c797c6133c4c18fab62 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 27 Aug 2021 17:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=A7=92=E8=89=B2=E5=85=B3=E7=B3=BB=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=88=A0=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/serviceimpl/AdminUserServiceImpl.java | 1 - .../modules/permission/serviceimpl/RoleServiceImpl.java | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index 25e9d426..6667985a 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -226,7 +226,6 @@ public class AdminUserServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.in("user_id", ids); userRoleService.remove(queryWrapper); - } /** diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java index 09b4da2d..3a2093aa 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java @@ -5,6 +5,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.modules.permission.entity.dos.Role; import cn.lili.modules.permission.mapper.RoleMapper; import cn.lili.modules.permission.service.DepartmentRoleService; +import cn.lili.modules.permission.service.RoleMenuService; import cn.lili.modules.permission.service.RoleService; import cn.lili.modules.permission.service.UserRoleService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -36,6 +37,9 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Autowired private UserRoleService userRoleService; + @Autowired + private RoleMenuService roleMenuService; + @Override public List findByDefaultRole(Boolean defaultRole) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -56,6 +60,6 @@ public class RoleServiceImpl extends ServiceImpl implements Ro //删除角色 this.removeByIds(roleIds); //删除角色与菜单关联 - userRoleService.remove(queryWrapper); + roleMenuService.remove(queryWrapper); } }