From a0a738130a0c794700ff075cf3a7f257697dbefd Mon Sep 17 00:00:00 2001
From: ruying408 <1877972603@qq.com>
Date: Tue, 6 Aug 2024 22:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E5=90=8E=E5=8F=B0=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/modules/base/entity/sys/BaseSysUserRoleEntity.java | 6 ++++--
 .../base/service/sys/impl/BaseSysUserServiceImpl.java       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java b/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java
index 17dbbc2..5f18e38 100644
--- a/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java
+++ b/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java
@@ -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;
 }
diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
index be2f87a..6b74046 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
@@ -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",