查询机构人员

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao">
+    <resultMap id="InstitutionAndUser" type="com.adc.da.slrs.sarInstitution.entity.TsInstitution">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="level" property="level"/>
+        <result column="name" property="name"/>
+        <collection property="users" ofType="com.adc.da.slrs.sarInstitution.entity.TsUserVO">
+            <result column="usid" property="id"/>
+            <result column="account" property="account"/>
+            <result column="uname" property="name"/>
+            <result column="institution_id" property="institutionId"/>
+        </collection>
+    </resultMap>
+    <select id="selectRootAndUser" resultMap="InstitutionAndUser">
+        select i.*,u.usid,u.account,u.uname,u.institution_id from ts_institution i
+        left join ts_user u
+        on i.id=u.institution_id
+        where i.parent_id is null or i.parent_id=''
+    </select>
 
+    <select id="selectAndUserByParent" resultMap="InstitutionAndUser">
+         select i.*,u.usid,u.account,u.uname,u.institution_id from ts_institution i
+        left join ts_user u
+        on i.id=u.institution_id
+        where i.parent_id = #{parentId}
+    </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml

@@ -24,7 +24,6 @@
         from ts_dictionary as t_d left join ts_dictype as t_d_t on t_d.ID=t_d_t.DIC_ID
         where
             t_d.ENABLE=0 and
-            t_d.DICTION_TYPE='SEL_OPTION' and
             t_d_t.DIC_ID is not null and
             t_d_t.DIC_TYPE_NAME is not null and
             t_d.DICTIONARY_NAME is not null