[新增] 上传报告流程开发

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -57,6 +57,10 @@
             <result column="name" property="name"/>
             <result column="remarks" property="remarks"/>
         </collection>
+        <collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
+            <id column="id" property="id"/>
+            <result column="org_name" property="orgName"/>
+        </collection>
     </resultMap>
 
 <!--    包含用户基本数据，角色数据，组织机构数据等-->
@@ -93,10 +97,19 @@
     <!--获取用户角色信息-->
     <select id="getUserWithRoles" resultMap="UserRoleMap" parameterType="java.lang.String">
         select
-        <include refid="User_Role_List"/>
+            u.*, r.id as id,
+            r.data_scope as dataScope,
+            r.del_flag as r_delFlag,
+            r.is_default as isDefault,
+            r.name as name,
+            r.remarks as remarks,
+            org.id as orgId,
+            org.org_name
         from TS_USER u
         left join TR_USER_ROLE ur on u.usid = ur.user_id
         left join TS_ROLE r on ur.role_id = r.id
+        left join TR_USER_org uo on u.usid = uo.user_id
+        left join TS_org org on uo.org_id = org.id and org.status = 1
         where u.usid = #{id}
     </select>