From d6688a367dc8dee7c489790daa5389de08e0531a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 09 七月 2024 10:42:40 +0800
Subject: [PATCH] !562 ♥️发布 5.2.1 正式版本 Merge pull request !562 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
index 9c5a212..a31c426 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
@@ -3,14 +3,14 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.dromara.system.domain.SysDept;
-import org.dromara.common.mybatis.helper.DataBaseHelper;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.SysRoleDept;
import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysRoleDeptMapper;
import org.dromara.system.service.ISysDataScopeService;
-import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,6 +30,12 @@
private final SysRoleDeptMapper roleDeptMapper;
private final SysDeptMapper deptMapper;
+ /**
+ * 鑾峰彇瑙掕壊鑷畾涔夋潈闄�
+ *
+ * @param roleId 瑙掕壊Id
+ * @return 閮ㄩ棬Id缁�
+ */
@Override
public String getRoleCustom(Long roleId) {
List<SysRoleDept> list = roleDeptMapper.selectList(
@@ -42,6 +48,12 @@
return null;
}
+ /**
+ * 鑾峰彇閮ㄩ棬鍙婁互涓嬫潈闄�
+ *
+ * @param deptId 閮ㄩ棬Id
+ * @return 閮ㄩ棬Id缁�
+ */
@Override
public String getDeptAndChild(Long deptId) {
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
@@ -49,11 +61,8 @@
.apply(DataBaseHelper.findInSet(deptId, "ancestors")));
List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
ids.add(deptId);
- List<SysDept> list = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
- .select(SysDept::getDeptId)
- .in(SysDept::getDeptId, ids));
- if (CollUtil.isNotEmpty(list)) {
- return StreamUtils.join(list, d -> Convert.toStr(d.getDeptId()));
+ if (CollUtil.isNotEmpty(ids)) {
+ return StreamUtils.join(ids, Convert::toStr);
}
return null;
}
--
Gitblit v1.9.3