mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复权限菜单bug

This commit is contained in:
TinyAnts 2022-09-15 10:35:19 +08:00
parent a5d34a3dc5
commit 2dc69f2453
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java
View File

@ -167,8 +167,8 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
SystemAuthDept model = systemAuthDeptMapper.selectOne( SystemAuthDept model = systemAuthDeptMapper.selectOne(
new QueryWrapper<SystemAuthDept>() new QueryWrapper<SystemAuthDept>()
.select(SystemAuthDept.class, info -> .select(SystemAuthDept.class, info ->
!info.getColumn().equals("is_delete") && !info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time")) !info.getColumn().equals("delete_time"))
.eq("id", systemAuthDeptParam.getId()) .eq("id", systemAuthDeptParam.getId())
.eq("is_delete", 0) .eq("is_delete", 0)
.last("limit 1")); .last("limit 1"));

5
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java
View File

@ -51,7 +51,10 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
queryWrapper.eq("is_disable", 0); queryWrapper.eq("is_disable", 0);
queryWrapper.orderByDesc("menu_sort"); queryWrapper.orderByDesc("menu_sort");
queryWrapper.orderByAsc("id"); queryWrapper.orderByAsc("id");
if (adminId != 1 && menuIds.size() > 0) { if (adminId != 1) {
if ( menuIds.size() <= 0) {
menuIds.add(0);
}
queryWrapper.in("id", menuIds); queryWrapper.in("id", menuIds);
} }