From 6c84640e1e5d39b30a58e28efbe334d20f807187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 9 Mar 2022 12:12:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=20find=5Fin=5Fset?= =?UTF-8?q?=20=E5=87=BD=E6=95=B0=E5=A4=9A=E7=B1=BB=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/dubbo/RemoteDataScopeServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 4 ++-- .../com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDataScopeServiceImpl.java index caa8ed30..0ad8fe2d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDataScopeServiceImpl.java @@ -49,7 +49,7 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService { .select(SysDept::getDeptId) .eq(SysDept::getDeptId, deptId) .or() - .apply("find_in_set({0},ancestors)", deptId)); + .apply("find_in_set({0},ancestors) <> 0", deptId)); if (CollUtil.isNotEmpty(list)) { return list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(",")); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index ecf2de80..e3e6824b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -108,7 +108,7 @@ public class SysDeptServiceImpl implements ISysDeptService { public long selectNormalChildrenDeptById(Long deptId) { return baseMapper.selectCount(new LambdaQueryWrapper() .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .apply("find_in_set({0}, ancestors)", deptId)); + .apply("find_in_set({0}, ancestors) <> 0", deptId)); } /** @@ -234,7 +234,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { List children = baseMapper.selectList(new LambdaQueryWrapper() - .apply("find_in_set({0},ancestors)", deptId)); + .apply("find_in_set({0},ancestors) <> 0", deptId)); List list = new ArrayList<>(); for (SysDept child : children) { SysDept dept = new SysDept(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 9a1be360..4425ae0c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -81,7 +81,7 @@ public class SysUserServiceImpl implements ISysUserService { .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { List deptList = deptMapper.selectList(new LambdaQueryWrapper() .select(SysDept::getDeptId) - .apply("find_in_set({0},ancestors)", user.getDeptId())); + .apply("find_in_set({0},ancestors) <> 0", user.getDeptId())); w.eq("u.dept_id", user.getDeptId()) .or() .in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));