From 2dc69f2453988f912fe2218fd6ad705181c10800 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 15 Sep 2022 10:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/system/impl/SystemAuthDeptServiceImpl.java | 4 ++-- .../admin/service/system/impl/SystemAuthMenuServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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); }