From b5e5d6317b85f63ffac5975d7cfcacf938b1b81a Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 23 Feb 2024 11:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/base/SelectMapper.xml   | 10 +++++-----
 .../src/main/resources/mapper/base/UserMapper.xml | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
index 1181afb..9fa2c56 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
@@ -4,11 +4,11 @@
 
     <!--组织机构树-->
     <select id="getOrgTree" resultType="com.securitycontrol.entity.system.vo.TreeNode">
-        SELECT dict_id AS id,
-               p_code AS parentId,
-               dict_value AS label
-        FROM sys_dict
-        WHERE del_flag = '0'
+        SELECT org_id AS id,
+               p_id AS parentId,
+               org_name AS label
+        FROM sys_org
+        WHERE del_flag = 0
     </select>
     <!--角色下拉选-->
     <select id="getRoleLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
index 9207ccb..39235ae 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
@@ -15,10 +15,10 @@
                 <if test="createTime != null and createTime != ''">create_time,</if>
                 <if test="phone != null and phone != ''">phone,</if>
                 <if test="loginType != null and loginType != ''">login_type,</if>
-                <if test="userType != null and userType != ''">user_type,</if>
+                <if test="userType != null">user_type,</if>
                 <if test="isAdmin != null and isAdmin != ''">is_admin,</if>
                 <if test="roleId != null and roleId != ''">role_id,</if>
-                <if test="accountStatus != null and accountStatus != ''">status,</if>
+                <if test="accountStatus != null">status,</if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="userName != null and userName != ''">#{userName},</if>
@@ -30,10 +30,10 @@
                 <if test="createTime != null and createTime != ''">#{createTime},</if>
                 <if test="phone != null and phone != ''">#{phone},</if>
                 <if test="loginType != null and loginType != ''">#{loginType},</if>
-                <if test="userType != null and userType != ''">#{userType},</if>
+                <if test="userType != null">#{userType},</if>
                 <if test="isAdmin != null and isAdmin != ''">#{isAdmin},</if>
                 <if test="roleId != null and roleId != ''">#{roleId},</if>
-                <if test="accountStatus != null and accountStatus != ''">#{accountStatus},</if>
+                <if test="accountStatus != null">#{accountStatus},</if>
             </trim>
         </if>
         <if test="type == 2">
@@ -80,7 +80,12 @@
                su.user_name AS userName,
                su.login_name AS loginName,
                su.del_flag AS delFlag,
-               su.phone
+               su.phone,
+               su.org_id AS orgId,
+               su.login_type AS loginType,
+               su.user_type AS userType,
+               su.role_id AS roleId,
+               su.status AS accountStatus
         FROM sys_user su
         WHERE user_id = #{userId}
     </select>