去掉额外的fk包

adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java

@@ -3,6 +3,8 @@ package com.adc.da.sys.vo;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.adc.da.sys.entity.OrgEO;
+import com.adc.da.sys.entity.RoleEO;
 import com.adc.da.sys.vo.iam.OrgsShortVoIAM;
 import lombok.Data;
 
@@ -43,12 +45,11 @@ public class UserVO {
     /**
      * 角色ID列表
      */
-    private List<String> roleIdList = new ArrayList<>();
-
+    private List<RoleEO> roleEOList = new ArrayList<>();
 
     /**
      * 部门列表
      */
-    private List<OrgsShortVoIAM> orgList = new ArrayList();
+    private List<OrgEO> orgList = new ArrayList();
 
 }

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

@@ -58,6 +58,27 @@
         </collection>
     </resultMap>
 
+<!--    包含用户基本数据，角色数据，组织机构数据等-->
+    <resultMap id="UserDetailMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
+        <result column="usid" property="usid"></result>
+        <result column="usname" property="usname"></result>
+        <result column="account" property="account"></result>
+        <collection property="roleEOList" ofType="com.adc.da.sys.entity.RoleEO" javaType="list">
+            <id column="r_id" property="id"/>
+            <result column="r_data_scope" property="dataScope"/>
+            <result column="r_delFlag" property="delFlag"/>
+            <result column="r_is_default" property="isDefault"/>
+            <result column="r_name" property="name"/>
+        </collection>
+        <collection property="orgEOList" ofType="com.adc.da.sys.entity.OrgEO" javaType="list">
+            <id column="o_id" property="id"/>
+            <result column="o_org_code" property="orgCode"/>
+            <result column="o_org_name" property="orgName"/>
+            <result column="o_sup_org_code" property="supOrgCode"/>
+            <result column="o_bmdm14" property="bmdm14"/>
+        </collection>
+    </resultMap>
+
     <!---->
     <sql id="User_Role_List">
 		u.*, r.id as id,
@@ -115,9 +136,26 @@
 
     </select>
 
-    <select id="getUserByIdList" resultMap="com.adc.da.sys.vo.UserVO" parameterType="java.lang.String">
-        select users.usid, users.usname, users.account
+    <select id="getUserByIdList" resultMap="UserDetailMap" parameterType="java.lang.String">
+        select
+            users.usid,
+            users.usname,
+            users.account
+            r.id as r_id,
+            r.data_scope as r_data_scope,
+            r.del_flag as r_delFlag,
+            r.is_default as r_is_default,
+            r.name as r_name,
+            o.id as o_id,
+            o.org_code as o_org_code,
+            o.org_name as o_org_name,
+            o.sup_org_code as o_sup_org_code,
+            o.bmdm14 as o_bmdm14
         from TS_USER users
+        left join TR_USER_ROLE ur on users.usid = ur.user_id
+        left join TS_ROLE r on ur.role_id = r.id
+        left join TS_USER_ORG uo on users.usid = uo.user_id
+        left join TS_ORG o on uo.org_id = o.id
         where del_flag != 1
         and users.usid in
         <foreach collection="userIdList" item="id" open="(" separator="," close=")">