From f1161213b35494695f8d61c63600580e6086da53 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 4 Jan 2022 17:42:59 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?= =?UTF-8?q?ose=20#3530=20=E9=83=A8=E9=97=A8=E6=A0=91=E3=80=81=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=91=E6=94=AF=E6=8C=81=E6=8C=89=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=20=E6=96=B9=E4=BE=BF=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/service/impl/SysDeptServiceImpl.java | 6 +++--- .../pigx/admin/service/impl/SysMenuServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 2e14e8399..ebfa50795 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -125,9 +125,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl List deptAllList = deptMapper .selectList(Wrappers.lambdaQuery().like(SysDept::getName, deptName)); // 查询数据权限内部门 - List deptOwnIdList = deptMapper - .selectListByScope(Wrappers.lambdaQuery().like(SysDept::getName, deptName), new DataScope()) - .stream().map(SysDept::getDeptId).collect(Collectors.toList()); + List deptOwnIdList = deptMapper.selectListByScope( + Wrappers.lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName), + new DataScope()).stream().map(SysDept::getDeptId).collect(Collectors.toList()); // 权限内部门 List> collect = deptAllList.stream() diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index a1ce66933..da1ef5f92 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -104,8 +104,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl Long parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; List> collect = baseMapper - .selectList(Wrappers.lambdaQuery().like(SysMenu::getName, menuName) - .orderByAsc(SysMenu::getSortOrder)) + .selectList( + Wrappers.lambdaQuery().like(StrUtil.isNotBlank(menuName), SysMenu::getName, menuName) + .orderByAsc(SysMenu::getSortOrder)) .stream().map(getNodeFunction()).collect(Collectors.toList()); // 模糊查询 不组装树结构 直接返回 表格方便编辑