修复权限菜单bug
This commit is contained in:
parent
a5d34a3dc5
commit
2dc69f2453
|
|
@ -167,8 +167,8 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
|
|||
SystemAuthDept model = systemAuthDeptMapper.selectOne(
|
||||
new QueryWrapper<SystemAuthDept>()
|
||||
.select(SystemAuthDept.class, info ->
|
||||
!info.getColumn().equals("is_delete") &&
|
||||
!info.getColumn().equals("delete_time"))
|
||||
!info.getColumn().equals("is_delete") &&
|
||||
!info.getColumn().equals("delete_time"))
|
||||
.eq("id", systemAuthDeptParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
|
|
|||
|
|
@ -51,7 +51,10 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
|
|||
queryWrapper.eq("is_disable", 0);
|
||||
queryWrapper.orderByDesc("menu_sort");
|
||||
queryWrapper.orderByAsc("id");
|
||||
if (adminId != 1 && menuIds.size() > 0) {
|
||||
if (adminId != 1) {
|
||||
if ( menuIds.size() <= 0) {
|
||||
menuIds.add(0);
|
||||
}
|
||||
queryWrapper.in("id", menuIds);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue