From 23d546195565d7e1311a6824846defd964665257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 29 Apr 2025 17:10:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=85=E5=AE=A1=E6=A0=B8=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BE=85=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AppUserMapper.xml  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index ac3a9649..48274cd7 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -112,7 +112,13 @@
     </select>
 
     <select id="searchAppUserForAdmin" parameterType="com.nflg.mobilebroken.common.pojo.request.SearchAppUserForAdminRequest" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserForAdminVO">
-        SELECT IF(aua.id IS NULL,CONCAT('u-',au.id),CONCAT('f-',aua.id)) AS 'key',au.id,au.avatar,au.login_name,au.`name` AS 'userName',fun_getUserCompanys(au.company_id) AS 'companyName',au.`name`,au.email,au.sales_user_name,IF(au.is_primary,fun_getPrimaryUserArea(au.company_id),aa.`name`) AS 'areaName',au.state AS 'userState',au.expire_time,IF(aua.id IS NOT NULL,0,IF(CONVERT_TZ(NOW(), @@session.time_zone, '+00:00') &lt; au.expire_time,1,2)) AS 'state',au.create_by,au.create_time,au.update_by,au.update_time,au.last_login_time,au.is_primary,au.company_id,au.phone,au.area_id,au.language_code,p.position_name AS 'title',au.title_id
+        SELECT IF(aua.id IS NULL,CONCAT('u-',au.id),CONCAT('f-',aua.id)) AS 'key',au.id,au.avatar,au.login_name
+        ,au.`name` AS 'userName',fun_getUserCompanys(au.company_id) AS 'companyName',au.`name`,au.email,au.sales_user_name
+        ,IF(au.is_primary,fun_getPrimaryUserArea(au.company_id),aa.`name`) AS 'areaName',au.state AS 'userState'
+        ,au.expire_time,IF(aua.id IS NOT NULL,0
+        ,IF(CONVERT_TZ(NOW(), @@session.time_zone, '+00:00') &lt; au.expire_time,1,2)) AS 'state',au.create_by
+        ,au.create_time,au.update_by,au.update_time,au.last_login_time,au.is_primary,au.company_id,au.phone,au.area_id
+        ,au.language_code,p.position_name AS 'title',au.title_id
         FROM app_user au
         LEFT JOIN app_area aa ON au.area_id=aa.id
         LEFT JOIN app_user_applyfor aua ON aua.user_id=au.id AND aua.state=0
@@ -140,7 +146,13 @@
             AND aua.id IS NULL AND CONVERT_TZ(NOW(), @@session.time_zone, '+00:00') >= au.expire_time
         </if>
         UNION
-        SELECT CONCAT('f-',aua.id) AS 'key',aua.id,aua.user_avatar AS 'avatar',aua.user_email AS 'loginName',aua.`user_name` AS 'userName',fun_getUserCompanys(aua.company_id) AS 'companyName',aua.user_name AS 'name',aua.user_email AS 'email',aua.sales_user_name,IF(aua.is_primary,fun_getPrimaryUserArea(aua.company_id),aa.`name`) AS 'areaName',0 AS 'userState',null AS 'expireTime',0 AS 'state',au.name AS 'createBy',aua.create_time,null AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',aua.is_primary,aua.company_id,aua.user_phone AS 'phone',aua.area_id,aua.language_code,p.position_name AS 'title',aua.title_id
+        SELECT CONCAT('f-',aua.id) AS 'key',aua.id,aua.user_avatar AS 'avatar',aua.user_email AS 'loginName'
+        ,aua.`user_name` AS 'userName',fun_getUserCompanys(aua.company_id) AS 'companyName',aua.user_name AS 'name'
+        ,aua.user_email AS 'email',aua.sales_user_name
+        ,IF(aua.is_primary,fun_getPrimaryUserArea(aua.company_id),aa.`name`) AS 'areaName'
+        ,null AS 'userState',null AS 'expireTime',0 AS 'state',au.name AS 'createBy',aua.create_time,null AS 'updateBy'
+        ,null AS 'updateTime',null AS 'lastLoginTime',aua.is_primary,aua.company_id,aua.user_phone AS 'phone',aua.area_id
+        ,aua.language_code,p.position_name AS 'title',aua.title_id
         FROM app_user_applyfor aua
         LEFT JOIN app_user au ON au.id=aua.create_by
         LEFT JOIN app_area aa ON aua.area_id=aa.id