NCZY/WAI_Project_BACKEND
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复:后台人员查询列表字段关联错误

Browse Source
This commit is contained in:
ruying408
2024-08-06 22:03:14 +08:00
parent 4d53834dcb
commit a0a738130a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java
View File

@@ -1,9 +1,9 @@
package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
@@ -11,9 +11,11 @@ import lombok.Setter;
@Setter
@Table(value = "base_sys_user_role", comment = "系统用户角色表")
public class BaseSysUserRoleEntity extends BaseEntity<BaseSysUserRoleEntity> {
@Index
@ColumnDefine(comment = "用户ID", type = "bigint")
private Long userId;
@Index
@ColumnDefine(comment = "角色ID", type = "bigint")
private Long roleId;
}

4
src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
View File

@@ -55,6 +55,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
Long[].class);
String databaseDialect = DatabaseDialectUtils.getDatabaseDialect();
if (databaseDialect.equals(DatabaseDialect.PostgreSQL)) {
// 兼容postgresql
qw.select("base_sys_user.id","base_sys_user.create_time","base_sys_user.department_id",
"base_sys_user.email","base_sys_user.head_img","base_sys_user.name","base_sys_user.nick_name",
"base_sys_user.phone","base_sys_user.remark","base_sys_user.status",
@@ -72,7 +73,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
qw.from(BASE_SYS_USER_ENTITY).leftJoin(BASE_SYS_USER_ROLE_ENTITY)
.on(BASE_SYS_USER_ENTITY.ID.eq(BASE_SYS_USER_ROLE_ENTITY.USER_ID))
.leftJoin(BASE_SYS_ROLE_ENTITY)
.on(BASE_SYS_USER_ROLE_ENTITY.USER_ID.eq(BASE_SYS_ROLE_ENTITY.ID))
.on(BASE_SYS_USER_ROLE_ENTITY.ROLE_ID.eq(BASE_SYS_ROLE_ENTITY.ID))
.leftJoin(BASE_SYS_DEPARTMENT_ENTITY)
.on(BASE_SYS_USER_ENTITY.DEPARTMENT_ID.eq(BASE_SYS_DEPARTMENT_ENTITY.ID));
@@ -94,6 +95,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
: permsDepartmentArr,
!CoolSecurityUtil.getAdminUsername().equals("admin")));
if (databaseDialect.equals(DatabaseDialect.PostgreSQL)) {
// 兼容postgresql
qw.groupBy("base_sys_user.id","base_sys_user.create_time","base_sys_user.department_id",
"base_sys_user.email","base_sys_user.head_img","base_sys_user.name","base_sys_user.nick_name",
"base_sys_user.phone","base_sys_user.remark","base_sys_user.status",