From 4bd749ff37cd29c07440fcf92f59f413c5b0f57c Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Thu, 30 Nov 2023 09:49:09 +0800
Subject: [PATCH] Optimize search in user management api

---
 .../api/mapper/permission/UserMapper.kt       |  2 +-
 .../api/param/permission/user/UserGetParam.kt |  3 +
 .../permission/impl/UserServiceImpl.kt        |  2 +-
 .../mapper/permission/UserMapper.xml          | 64 +++++++++++++++++--
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt b/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt
index c8eca89..db9f519 100644
--- a/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt
+++ b/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt
@@ -16,7 +16,7 @@ import top.fatweb.api.entity.permission.User
 interface UserMapper : BaseMapper<User> {
     fun selectOneWithPowerInfoByUsername(@Param("username")username: String): User?
 
-    fun selectPage(page: IPage<Long>, searchValue: String?, searchRegex: Boolean): IPage<Long>
+    fun selectPage(page: IPage<Long>, searchType: String, searchValue: String?, searchRegex: Boolean): IPage<Long>
 
     fun selectListWithRoleInfoByIds(userIds: List<Long>): List<User>?
 
diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt
index 2b67b0b..46d9e40 100644
--- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt
+++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt
@@ -11,6 +11,9 @@ import top.fatweb.api.param.PageSortParam
  */
 @Schema(description = "用户查询请求参数")
 data class UserGetParam(
+    @Schema(description = "搜索类型", allowableValues = ["ALL", "ID", "USERNAME", "NICKNAME", "EMAIL"], defaultValue = "ALL")
+    val searchType: String = "ALL",
+
     @Schema(description = "查询内容")
     val searchValue: String? = null,
 
diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt
index 493df2c..27627e9 100644
--- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt
+++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt
@@ -66,7 +66,7 @@ class UserServiceImpl(
         PageUtil.setPageSort(userGetParam, userIdsPage, OrderItem.asc("id"))
 
         val userIdsIPage =
-            baseMapper.selectPage(userIdsPage, userGetParam?.searchValue, userGetParam?.searchRegex ?: false)
+            baseMapper.selectPage(userIdsPage,userGetParam?.searchType ?: "ALL", userGetParam?.searchValue, userGetParam?.searchRegex ?: false)
         val userPage = Page<User>(userIdsIPage.current, userIdsIPage.size, userIdsIPage.total)
         if (userIdsIPage.total > 0) {
             userPage.setRecords(baseMapper.selectListWithRoleInfoByIds(userIdsIPage.records))
diff --git a/src/main/resources/mapper/permission/UserMapper.xml b/src/main/resources/mapper/permission/UserMapper.xml
index ab7442d..d9b6541 100644
--- a/src/main/resources/mapper/permission/UserMapper.xml
+++ b/src/main/resources/mapper/permission/UserMapper.xml
@@ -59,13 +59,67 @@
     </select>
 
     <select id="selectPage" resultType="long">
-        select id
+        select t_user.id
         from t_user
+        left join (select * from t_user_info where deleted = 0) as tui on t_user.id = tui.user_id
         <where>
-            deleted = 0
-        <if test="searchValue != null">
-
-        </if>
+            t_user.deleted = 0
+            <if test="searchValue != null">
+                <choose>
+                    <when test="searchType == 'ID'">
+                        <choose>
+                            <when test="searchRegex == true">
+                                and t_user.id regexp #{searchValue}
+                            </when>
+                            <otherwise>
+                                and t_user.id like concat('%' ,#{searchValue}, '%')
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="searchType == 'USERNAME'">
+                        <choose>
+                            <when test="searchRegex == true">
+                                and t_user.username regexp #{searchValue}
+                            </when>
+                            <otherwise>
+                                and t_user.username like concat('%' ,#{searchValue}, '%')
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="searchType == 'NICKNAME'">
+                        <choose>
+                            <when test="searchRegex == true">
+                                and tui.nickname regexp #{searchValue}
+                            </when>
+                            <otherwise>
+                                and tui.nickname like concat('%' ,#{searchValue}, '%')
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="searchType == 'EMAIL'">
+                        <choose>
+                            <when test="searchRegex == true">
+                                and tui.email regexp #{searchValue}
+                            </when>
+                            <otherwise>
+                                and tui.email like concat('%' ,#{searchValue}, '%')
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <otherwise>
+                        <choose>
+                            <when test="searchRegex == true">
+                                and ( t_user.username regexp #{searchValue} or tui.nickname regexp #{searchValue} or
+                                tui.email regexp #{searchValue})
+                            </when>
+                            <otherwise>
+                                and (t_user.username like concat('%' ,#{searchValue}, '%') or tui.nickname like
+                                concat('%' ,#{searchValue}, '%') or tui.email like concat('%' ,#{searchValue}, '%'))
+                            </otherwise>
+                        </choose>
+                    </otherwise>
+                </choose>
+            </if>
         </where>
     </select>