diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java index 2b2c4522..4e1e2415 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java @@ -167,8 +167,8 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { SystemAuthDept model = systemAuthDeptMapper.selectOne( new QueryWrapper() .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")); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java index 830367e1..b45f9f9d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java @@ -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); }