admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 处理 find_in_set 函数多类型数据库兼容性问题

Browse Source
This commit is contained in:
疯狂的狮子li 2022-03-09 12:11:34 +08:00
parent d73cd5ed27
commit 78d0e67987
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
.select(SysDept::getDeptId) .select(SysDept::getDeptId)
.eq(SysDept::getDeptId, deptId) .eq(SysDept::getDeptId, deptId)
.or() .or()
.apply("find_in_set({0},ancestors)", deptId)); .apply("find_in_set({0},ancestors) <> 0", deptId));
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
return list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(",")); return list.stream().map(d -> Convert.toStr(d.getDeptId())).collect(Collectors.joining(","));
} }

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -108,7 +108,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
public long selectNormalChildrenDeptById(Long deptId) { public long selectNormalChildrenDeptById(Long deptId) {
return baseMapper.selectCount(new LambdaQueryWrapper<SysDept>() return baseMapper.selectCount(new LambdaQueryWrapper<SysDept>()
.eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) .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) { public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
List<SysDept> children = baseMapper.selectList(new LambdaQueryWrapper<SysDept>() List<SysDept> children = baseMapper.selectList(new LambdaQueryWrapper<SysDept>()
.apply("find_in_set({0},ancestors)", deptId)); .apply("find_in_set({0},ancestors) <> 0", deptId));
List<SysDept> list = new ArrayList<>(); List<SysDept> list = new ArrayList<>();
for (SysDept child : children) { for (SysDept child : children) {
SysDept dept = new SysDept(); SysDept dept = new SysDept();

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -80,7 +80,7 @@ public class SysUserServiceImpl implements ISysUserService {
.and(ObjectUtil.isNotNull(user.getDeptId()), w -> { .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>() List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId) .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()) w.eq("u.dept_id", user.getDeptId())
.or() .or()
.in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); .in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));