From 7b2ee34917aedcb88ad85ceea73eef06f66853b4 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Mon, 30 Oct 2023 23:57:49 +0800
Subject: [PATCH] Optimize UserInfo

---
 .../fatweb/api/entity/permission/UserInfo.kt    |  5 ++++-
 .../V1_0_0_231104__Add_table_'t_user_info'.sql  | 17 +++++++++--------
 .../resources/mapper/permission/UserMapper.xml  |  9 +++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt b/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt
index 2921d95..e726aab 100644
--- a/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt
+++ b/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt
@@ -18,6 +18,9 @@ class UserInfo : Serializable {
     @TableId("id")
     var id: Long? = null
 
+    @TableField("user_id")
+    var userId: Long? = null
+
     /**
      * 昵称
      */
@@ -57,6 +60,6 @@ class UserInfo : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "UserInfo(id=$id, nickName=$nickName, avatar=$avatar, email=$email, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
+        return "UserInfo(id=$id, userId=$userId, nickName=$nickName, avatar=$avatar, email=$email, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
     }
 }
diff --git a/src/main/resources/db/migration/V1_0_0_231104__Add_table_'t_user_info'.sql b/src/main/resources/db/migration/V1_0_0_231104__Add_table_'t_user_info'.sql
index dd2311f..b6e59ed 100644
--- a/src/main/resources/db/migration/V1_0_0_231104__Add_table_'t_user_info'.sql
+++ b/src/main/resources/db/migration/V1_0_0_231104__Add_table_'t_user_info'.sql
@@ -2,12 +2,13 @@ drop table if exists t_user_info;
 
 create table if not exists t_user_info
 (
-    id        bigint       not null primary key,
-    nick_name varchar(50)  null comment '昵称',
-    avatar    varchar(500) null comment '头像',
-    email     varchar(100) null comment '邮箱',
-    create_time            datetime    not null default (utc_timestamp()) comment '创建时间',
-    update_time            datetime    not null default (utc_timestamp()) comment '修改时间',
-    deleted                bigint      not null default 0,
-    version                int         not null default 0
+    id          bigint       not null primary key,
+    user_id     bigint       not null comment '用户ID',
+    nick_name   varchar(50)  null comment '昵称',
+    avatar      varchar(500) null comment '头像',
+    email       varchar(100) null comment '邮箱',
+    create_time datetime     not null default (utc_timestamp()) comment '创建时间',
+    update_time datetime     not null default (utc_timestamp()) comment '修改时间',
+    deleted     bigint       not null default 0,
+    version     int          not null default 0
 ) comment '用户信息表';
\ No newline at end of file
diff --git a/src/main/resources/mapper/permission/UserMapper.xml b/src/main/resources/mapper/permission/UserMapper.xml
index e058d98..b2f7861 100644
--- a/src/main/resources/mapper/permission/UserMapper.xml
+++ b/src/main/resources/mapper/permission/UserMapper.xml
@@ -17,6 +17,14 @@
                t_user.update_time            as user_update_time,
                t_user.deleted                as user_deleted,
                t_user.version                as user_version,
+               tui.id                        as user_info_id,
+               tui.nick_name                 as user_info_nick_name,
+               tui.avatar                    as user_info_avatar,
+               tui.email                     as user_info_email,
+               tui.create_time               as user_info_create_time,
+               tui.update_time               as user_info_update_time,
+               tui.deleted                   as user_info_deleted,
+               tui.version                   as user_info_version,
                tmo.id                        as module_id,
                tmo.name                      as module_name,
                tmo.power_id                  as module_power_id,
@@ -36,6 +44,7 @@
                t.power_id                    as operation_power_id,
                t.element_id                  as operation_element_id
         from t_user
+                 left join (select * from t_user_info where deleted = 0) as tui on t_user.id = tui.user_id
                  left join (select * from t_user_group where deleted = 0) as tug on t_user.id = tug.user_id
                  left join (select * from t_group where deleted = 0 and enable = 1) as tg on tg.id = tug.group_id
                  left join (select * from t_role_group where deleted = 0) as trg on tg.id = trg.group_id