opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复数据拼接错误

Browse Source
This commit is contained in:
疯狂的狮子Li 2021-12-12 00:56:49 +08:00
parent 82193c91e5
commit cd8fff8bc4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleDept;
@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@Service("sdss") @Service("sdss")
public class SysDataScopeServiceImpl implements SysDataScopeService { public class SysDataScopeServiceImpl implements SysDataScopeService {
@ -28,7 +29,7 @@ public class SysDataScopeServiceImpl implements SysDataScopeService {
.select(SysRoleDept::getDeptId) .select(SysRoleDept::getDeptId)
.eq(SysRoleDept::getRoleId, roleId)); .eq(SysRoleDept::getRoleId, roleId));
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
return StrUtil.join(",", list); return list.stream().map(rd -> Convert.toStr(rd.getDeptId())).collect(Collectors.joining(","));
} }
return null; return null;
} }
@ -41,7 +42,7 @@ public class SysDataScopeServiceImpl implements SysDataScopeService {
.or() .or()
.apply("find_in_set({0},ancestors)", deptId)); .apply("find_in_set({0},ancestors)", deptId));
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
return StrUtil.join(",", list); return list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(","));
} }
return null; return null;
} }