From 82aa2a113980a5f1840626cec4543b9cbeacc07f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 17:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/sys/entity/UserEO.java  |  5 +++++
 .../resources/mybatis/mapper/sys/UserEOMapper.xml    | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
index e77056ef..e05e2dd8 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
@@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable {
     private String password;
     private String account;
     private String usid;
+    private String sex;
+    private String phone;
+    private String upDeptName;
+    private String upDeptId;
+
     // 扩展字段
     private  String userType;
     private String orgId;
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 0b4986d5..c0bb3b8a 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -30,6 +30,8 @@
         <result column="role_id" property="roleId"/>
         <result column="INSTITUTION_NAME" property="institutionName"/>
         <result column="INSTITUTION_ID" property="institutionId"/>
+        <result column="SEX" property="sex"/>
+        <result column="PHONE" property="phone"/>
     </resultMap>
 
     <resultMap id="SSOResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -80,7 +82,7 @@
     <!-- TS_USER table all fields -->
     <sql id="Base_Column_List">
 		usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
-		,INSTITUTION_NAME,INSTITUTION_ID
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE
 	</sql>
 
     <sql id="SSO_Column_List">
@@ -751,9 +753,11 @@
 
     <!-- 根据account获取未逻辑删除的UserEO -->
     <select id="getUserEOByAccountNotDeleted" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from TS_USER where account = #{account} and VALID_FLAG != 1
+        select usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE,ts_institution.name as upDeptName,ts_institution.id as upDeptId
+        from TS_USER
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
+        where account = #{account} and VALID_FLAG != 1
     </select>
 
     <select id="getNamesByIds" resultType="java.lang.String" parameterType="java.util.List">