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); } }