登陆接口 新增返回字段-----部门id 和 部门名称

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -2,6 +2,7 @@ package com.adc.da.sys.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@ import java.util.List;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Data
 public class UserEO extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 3658632939727891047L;
@@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable {
     private Integer unlockFlag;
     private String userInfoId;
     private String orgType;
-
+    private String institutionName;
+    private String institutionId;
     private String ssoId;
     private String token;
     /**

adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml

@@ -28,6 +28,8 @@
         <result column="FAX_ADDRESS" property="faxAddress"/>
         <result column="userInfoId" property="userInfoId"/>
         <result column="role_id" property="roleId"/>
+        <result column="INSTITUTION_NAME" property="institutionName"/>
+        <result column="INSTITUTION_ID" property="institutionId"/>
     </resultMap>
 
     <resultMap id="SSOResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -78,6 +80,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
 	</sql>
 
     <sql id="SSO_Column_List">