[新增] 解决一些流程流转的问题

adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java

@@ -1,14 +1,12 @@
 package com.adc.da.sync.service;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import com.adc.da.sync.service.dao.mysql.SyncIAMLogDao;
 import com.adc.da.sync.service.entity.SyncIAMLogEO;
 import com.adc.da.sync.service.enums.SyncTypeEnum;
 import com.adc.da.sys.constant.SysConstants;
 import com.adc.da.sys.constant.UserBelongEnum;
-import com.adc.da.sys.dao.mysql.OrgEODao;
 import com.adc.da.sys.entity.OrgEO;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.OrgEOService;
@@ -292,7 +290,7 @@ public class SyncIAMTimer {
                 orgList.add(orgEO);
             }
         }
-        userEO.setOrgList(orgList);
+        userEO.setOrgEOList(orgList);
 
         // 固定角色数据
         List<String> roleIdList = new ArrayList<>();

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.aspectj.weaver.ast.Or;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -133,7 +132,7 @@ public class UserEO extends BaseEntity implements Serializable {
      * 部门EO列表
      */
     @TableField(exist = false)
-    private List<OrgEO> orgList = new ArrayList<>();
+    private List<OrgEO> orgEOList = new ArrayList<>();
 
     /**
      * 角色ID列表

adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java

@@ -160,7 +160,7 @@ public class UserEOServiceImpl implements IUserEoService {
         });
 
         // 插入组织关联表
-        eo.getOrgList().forEach(c -> {
+        eo.getOrgEOList().forEach(c -> {
             UserOrgEO userOrgEO = new UserOrgEO();
             userOrgEO.setUserId(eo.getUsid());
             userOrgEO.setOrgId(c.getOrgCode());

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

@@ -4,9 +4,13 @@
 
     <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 from TS_USER t1
+        date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE
+        ,org.ID as ORGID,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
+        left JOIN tr_user_org uo on t1.usid= uo.user_id
+        left JOIN ts_org org on uo.org_id = org.id
         where t1.del_flag='0'
         <if test="account !='' and account !=null">
             and t1.ACCOUNT like  "%"#{account}"%"
@@ -57,7 +61,7 @@
             <result column="name" property="name"/>
             <result column="remarks" property="remarks"/>
         </collection>
-        <collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
+        <collection property="orgEOList" ofType="com.adc.da.sys.entity.OrgEO">
             <id column="id" property="orgCode"/>
             <result column="org_name" property="orgName"/>
         </collection>

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

@@ -92,7 +92,7 @@
   <!-- 插入记录 -->
   <insert id="insertBatch" parameterType="com.adc.da.sys.entity.UserOrgEO" >
     insert into TR_USER_ORG(<include refid="Base_Column_List" />)values
-    <foreach collection="UserOrgEOList" item="ur" separator=",">
+    <foreach collection="userOrgEOList" item="ur" separator=",">
       (#{ur.userId}, #{ur.orgId})
     </foreach>
   </insert>