From 0248e691c2d0b7655b9a4ed4105ed640766083a3 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 11 May 2023 15:08:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=B5=81=E7=A8=8B=E6=B5=81=E8=BD=AC=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/sync/service/SyncIAMTimer.java | 4 +- .../java/com/adc/da/sys/entity/UserEO.java | 3 +- .../adc/da/sys/service/UserEOServiceImpl.java | 2 +- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 8 +- .../mapper/sys/mysql/UserOrgEOMapper.xml | 2 +- .../adc/da/sync/service/SyncIAMTimer.class | Bin 10677 -> 10679 bytes .../service/ActivitDefineService.java | 3 + .../task/TodoTaskController.java | 78 ++++++++---------- .../com/adc/da/wkflow/enums/FlowTypeEnum.java | 2 +- .../listener/powerApply/twoApplyAfter.java | 3 + .../service/ActivitDefineService.class | Bin 5348 -> 5578 bytes .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 52725 -> 52358 bytes .../adc/da/wkflow/enums/FlowTypeEnum.class | Bin 2573 -> 2661 bytes .../wkflow/listener/SCBG/oneApplyAfter.class | Bin 5883 -> 6056 bytes .../listener/powerApply/reEditAfter.class | Bin 6227 -> 6130 bytes 16 files changed, 53 insertions(+), 52 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java index 7624abe..efeca15 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java +++ b/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 roleIdList = new ArrayList<>(); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 616c2c2..cc3a5bc 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/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 orgList = new ArrayList<>(); + private List orgEOList = new ArrayList<>(); /** * 角色ID列表 diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 071e5c6..7c982e5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/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()); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 924b657..4fb2ef3 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -4,9 +4,13 @@