From 95642b0166b340ac8cafcfb6a46b8aa240a4bf65 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 15:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java   | 5 ++++-
 .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 4923f79b..e77056ef 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
@@ -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;
     /**
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 2ffc9c1b..0b4986d5 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
@@ -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">