From 02f4fdb2e5b68ec97cc1d6ef83d145dc6318f89d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 十月 2022 09:16:06 +0800
Subject: [PATCH] !241 【轻量级 PR】修正Excel导出字典值转换方法由于内部调用缓存不生效问题 Merge pull request !241 from MichelleChung/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
index d2c5d5c..44f8625 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.helper.DataBaseHelper;
+import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleDeptMapper;
@@ -13,7 +14,6 @@
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 鏁版嵁鏉冮檺 瀹炵幇
@@ -37,7 +37,7 @@
.select(SysRoleDept::getDeptId)
.eq(SysRoleDept::getRoleId, roleId));
if (CollUtil.isNotEmpty(list)) {
- return list.stream().map(rd -> Convert.toStr(rd.getDeptId())).collect(Collectors.joining(","));
+ return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
}
return null;
}
@@ -47,13 +47,13 @@
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId)
.apply(DataBaseHelper.findInSet(deptId, "ancestors")));
- List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+ 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 list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(","));
+ return StreamUtils.join(list, d -> Convert.toStr(d.getDeptId()));
}
return null;
}
--
Gitblit v1.9.3