From 25d0fbeb811139d0e466e8ad41715c1a6900b861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 2 Apr 2025 15:25:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(AppUserMapper):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=81=8C=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20SQL=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 getUserInfo 方法中添加用户职位 ID 和职位名称字段
- 通过 LEFT JOIN t_base_position 表实现职位信息关联查询
- 优化 SQL 查询语句的格式，提高可读性
---
 .../main/resources/mapper/AppUserMapper.xml   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index f2ae0a80..c5f41624 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -39,15 +39,30 @@
         </foreach>
     </select>
     <select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
-        SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar
-                   ,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.state AS 'userState',u.create_by AS 'createBy'
-                   ,u.create_time AS 'createTime',u.update_by AS 'updateBy',u.update_time AS 'updateTime'
-                   ,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary'
-                   ,u.login_name AS 'loginName',u.phone
+        SELECT u.id
+             , u.area_id                                 AS 'areaId'
+             , c.agency_company_name                     AS 'companyName'
+             , u.`name`
+             , u.email
+             , u.avatar
+             , IF(u.is_primary, a1.area_name, a2.`name`) AS 'areaName'
+             , u.state                                   AS 'userState'
+             , u.create_by                               AS 'createBy'
+             , u.create_time                             AS 'createTime'
+             , u.update_by                               AS 'updateBy'
+             , u.update_time                             AS 'updateTime'
+             , u.last_login_time                         AS 'lastLoginTime'
+             , u.expire_time                             AS 'expireTime'
+             , u.is_primary                              AS 'isPrimary'
+             , u.login_name                              AS 'loginName'
+             , u.phone
+             , u.title_id
+             , p.position_name                           AS 'title'
         FROM app_user u
-         INNER JOIN t_base_customer c ON u.company_id = c.id
-         LEFT JOIN t_base_area a1 ON u.area_id = a1.id
-         LEFT JOIN app_area a2 ON u.area_id = a2.id
+                 INNER JOIN t_base_customer c ON u.company_id = c.id
+                 LEFT JOIN t_base_area a1 ON u.area_id = a1.id
+                 LEFT JOIN app_area a2 ON u.area_id = a2.id
+                 LEFT JOIN t_base_position p ON u.title_id = p.id
         WHERE u.id = #{userId}
     </select>