登录接口新增字段 上一级部门 id和名称

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;

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
+        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
-        <include refid="Base_Column_List"/>
+		,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE,ts_institution.name as upDeptName,ts_institution.id as upDeptId
-        from TS_USER where account = #{account} and VALID_FLAG != 1
+        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">