From d193bbd41475fc3a8a7cea58b178357191996976 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 7 Jan 2022 15:35:07 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=20=E9=80=82=E9=85=8D?= =?UTF-8?q?Oracle=20=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java | 2 +- .../pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 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 ebfa50795..e086b21c2 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 @@ -123,7 +123,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl public List> selectTree(String deptName) { // 查询全部部门 List deptAllList = deptMapper - .selectList(Wrappers.lambdaQuery().like(SysDept::getName, deptName)); + .selectList(Wrappers.lambdaQuery().like(StrUtil.isNotBlank(deptName),SysDept::getName, deptName)); // 查询数据权限内部门 List deptOwnIdList = deptMapper.selectListByScope( Wrappers.lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName), 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 da1ef5f92..48317ffa1 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 @@ -94,7 +94,6 @@ public class SysMenuServiceImpl extends ServiceImpl impl /** * 构建树查询 1. 不是懒加载情况，查询全部 2. 是懒加载，根据parentId 查询 2.1 父节点为空，则查询ID -1 - * @param lazy 是否是懒加载 * @param parentId 父节点ID * @param menuName 菜单名称 * @return