From cd312f1348812604f053212ed920c6a91e0224ec Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 15 三月 2022 10:20:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e5b54ab..09c5ba2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -82,9 +82,9 @@
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId)
.apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors")));
- w.eq("u.dept_id", user.getDeptId())
- .or()
- .in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
+ List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+ ids.add(user.getDeptId());
+ w.in("u.dept_id", ids);
});
return wrapper;
}
--
Gitblit v1.9.3