[修改] 解决一些流程bug

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

@@ -4,8 +4,9 @@
 
     <select id="list" parameterType="string" resultType="map">
         select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
-        date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE
-        ,org.ID as ORGID,org.org_name as ORGNAME
+        date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE,
+        GROUP_CONCAT( DISTINCT org.ID ) as ORGID,
+        GROUP_CONCAT( DISTINCT org.org_name )as ORGNAME
         from TS_USER t1
         left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID
         left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID
@@ -65,7 +66,7 @@
             <result column="remarks" property="remarks"/>
         </collection>
         <collection property="orgEOList" ofType="com.adc.da.sys.entity.OrgEO">
-            <id column="id" property="orgCode"/>
+            <id column="orgId" property="orgCode"/>
             <result column="org_name" property="orgName"/>
         </collection>
     </resultMap>