From ac47375aba17033ace1791bdebb5f5bb7d343827 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期四, 17 三月 2022 11:45:42 +0800
Subject: [PATCH] fix 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 d236c96..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
@@ -15,6 +15,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
@@ -80,10 +81,10 @@
.and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId)
- .apply("find_in_set({0},ancestors) <> 0", user.getDeptId()));
- w.eq("u.dept_id", user.getDeptId())
- .or()
- .in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
+ .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors")));
+ 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