From fde7cb5c2dc3548ffe716bcbbabe8da7998a086e Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 25 Jun 2026 09:53:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(workflow):=20=E9=9B=86=E6=88=90=E7=BA=BF?= =?UTF-8?q?=E4=B8=8B=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BA=A4=E6=8E=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/command/HumanUserUpdateExe.java | 70 ++++++++++++++++++- .../zcloud/basic/info/command/UserAddExe.java | 27 +++++++ .../UserChangeRecordWorkChangeExe.java | 45 ++++++++++++ .../basic/info/command/UserRemoveExe.java | 53 ++++++++++++++ .../basic/info/command/UserUpdateExe.java | 25 +++++++ .../enums/UserJobHandoverWorkTypeEnum.java | 6 +- .../basic/info/domain/model/CorpInfoE.java | 2 - .../zcloud/basic/info/domain/model/UserE.java | 10 --- .../repository/impl/UserRepositoryImpl.java | 1 + .../basic/info/utils/SyncPageResponse.java | 1 - 10 files changed, 223 insertions(+), 17 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java index 63122c22..ad10a6f0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java @@ -36,6 +36,9 @@ import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.zclouddomain.facade.ZcloudDomainFacade; import com.zcloud.gbscommon.zclouddomain.request.DomainQry; import com.zcloud.gbscommon.zclouddomain.response.DomainListByUserCO; +import com.zcloud.gbscommon.zcloudedu.request.EduWorkQry; +import com.zcloud.gbscommon.zcloudedu.response.EduListByUserCO; +import com.zcloud.gbscommon.zcloudedu.facade.ZcloudEduWorkFacade; import com.zcloud.gbscommon.zcloudeightwork.facade.ZcloudEightWorkFacade; import com.zcloud.gbscommon.zcloudeightwork.request.EightWorkQry; import com.zcloud.gbscommon.zcloudeightwork.response.EightWorkListByUserCO; @@ -111,6 +114,8 @@ public class HumanUserUpdateExe { private ZcloudDomainFacade zcloudDomainFacade; @DubboReference private ZcloudTechnologyFacade zcloudTechnologyFacade; + @DubboReference + private ZcloudEduWorkFacade zcloudEduWorkFacade; /** * 人资用户变更总入口。 @@ -282,8 +287,12 @@ public class HumanUserUpdateExe { } log.info("用户{}不存在待交接任务，直接完成离职处理", oldUserDO.getId()); - oldUserE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION.getCode()); - userGateway.update(oldUserE); +// oldUserE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION.getCode()); +// userGateway.update(oldUserE); + userRepository.updateEmploymentFlagAndDeleteEnum( + oldUserE.getId(), + UserEmploymentFlagEnum.RESIGNATION.getCode(), + "TRUE"); completeResignation(oldUserDO, userChangeRecordE); return true; } @@ -814,6 +823,14 @@ public class HumanUserUpdateExe { * @param userChangeRecordId 当前用户变更记录 id * @return 待交接工作列表 */ + /** + * 对外提供统一的离职待交接任务汇总能力。 + * 删除用户等场景可以复用这套任务汇总逻辑，避免复制各三方系统查询代码。 + */ + public List collectUserJob(Long userId, Long departmentId, Long corpinfoId, String userChangeRecordId) { + return getUserJob(userId, departmentId, corpinfoId, userChangeRecordId); + } + private List getUserJob(Long userId, Long departmentId, Long corpinfoId, String userChangeRecordId) { CompletableFuture> hiddenFuture = CompletableFuture.supplyAsync( () -> queryHiddenJobs(userId, departmentId, corpinfoId, userChangeRecordId)); @@ -831,9 +848,11 @@ public class HumanUserUpdateExe { () -> queryDomainJobs(userId, corpinfoId, userChangeRecordId)); CompletableFuture> technologyFuture = CompletableFuture.supplyAsync( () -> queryTechnologyJobs(userId, corpinfoId, userChangeRecordId)); + CompletableFuture> eduWorkFuture = CompletableFuture.supplyAsync( + () -> queryEduWorkJobs(userId, corpinfoId, userChangeRecordId)); CompletableFuture.allOf(hiddenFuture, riskFuture, eightWorkFuture, fireCheckFuture, - projectApprovalFuture, inspectionWorkFuture, domainFuture, technologyFuture).join(); + projectApprovalFuture, inspectionWorkFuture, domainFuture, technologyFuture, eduWorkFuture).join(); List allJob = new ArrayList<>(); allJob.addAll(hiddenFuture.join()); allJob.addAll(riskFuture.join()); @@ -843,6 +862,7 @@ public class HumanUserUpdateExe { allJob.addAll(inspectionWorkFuture.join()); allJob.addAll(domainFuture.join()); allJob.addAll(technologyFuture.join()); + allJob.addAll(eduWorkFuture.join()); log.info("离职待交接任务汇总完成，用户id:{}, 部门id:{}, 企业id:{}, 总数量:{}", userId, departmentId, corpinfoId, allJob.size()); return allJob; @@ -1065,6 +1085,50 @@ public class HumanUserUpdateExe { return new ArrayList<>(); } } + + /** + * 查询线下培训系统中的待交接任务。 + * 调用方式与其他三方系统保持一致，按用户和企业维度汇总待交接数据。 + * 三方接口异常时只记录日志，不影响离职主流程继续执行。 + */ + private List queryEduWorkJobs(Long userId, Long corpinfoId, String userChangeRecordId) { + EduWorkQry eduWorkQry = new EduWorkQry(); + eduWorkQry.setUserId(userId); + eduWorkQry.setCorpinfoId(corpinfoId); + + log.info("查询未完成工作,开始异步查询线下培训待交接任务，用户id:{}, 企业id:{}", userId, corpinfoId); + try { + MultiResponse response = zcloudEduWorkFacade.listManagerByUserId(eduWorkQry); + if (response == null || !response.isSuccess()) { + String errMessage = response == null ? "线下培训服务未返回结果" : response.getErrMessage(); + log.error("查询线下培训待交接任务失败，用户id:{}, 企业id:{}, 原因:{}", + userId, corpinfoId, errMessage); + return new ArrayList<>(); + } + + List eduList = response.getData(); + if (CollUtil.isEmpty(eduList)) { + log.info("线下培训待交接任务查询完成，未查询到数据，用户id:{}, 企业id:{}", userId, corpinfoId); + return new ArrayList<>(); + } + + List result = new ArrayList<>(); + eduList.forEach(info -> result.add(buildUserJobHandoverDO( + userId, + corpinfoId, + userChangeRecordId, + UserJobHandoverWorkTypeEnum.EDU_WORK.getCode(), + info.getWorkId(), + info.getWorkProject(), + info.getWorkContent()))); + log.info("线下培训待交接任务查询完成，用户id:{}, 企业id:{}, 数量:{}", + userId, corpinfoId, result.size()); + return result; + } catch (Exception e) { + log.error("查询线下培训待交接任务发生异常，用户id:{}, 企业id:{}", userId, corpinfoId, e); + return new ArrayList<>(); + } + } private List queryHiddenJobs(Long userId, Long departmentId, Long corpinfoId, String userChangeRecordId) { HiddenStatisticsListQry hiddenStatisticsListQry = new HiddenStatisticsListQry(); hiddenStatisticsListQry.setUserId(userId); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index b58f5886..f0b143a9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -129,6 +129,7 @@ public class UserAddExe { } userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId()); userEmploymentLogGateway.add(userEmploymentLogE); + addUserChangeRecordForSave(userE, corpInfoDO); } catch (Exception e) { throw new RuntimeException(e); } @@ -691,5 +692,31 @@ public class UserAddExe { } return userE.getId(); } + + /** + * 普通保存企业用户时补充一条用户变更记录。 + * 该场景只记录变更后的企业、部门、岗位和姓名信息，变更前信息保持为空。 + */ + private void addUserChangeRecordForSave(UserE userE, CorpInfoDO corpInfoDO) { + String corpName = corpInfoDO == null ? null : corpInfoDO.getCorpName(); + String departmentName = null; + String postName = userE.getPostName(); + if (userE.getDepartmentId() != null) { + DepartmentDO departmentDO = departmentRepository.getById(userE.getDepartmentId()); + if (departmentDO != null) { + departmentName = departmentDO.getName(); + } + } + if (userE.getPostId() != null && StringUtils.isEmpty(postName)) { + PostDO postDO = postRepository.getById(userE.getPostId()); + if (postDO != null) { + postName = postDO.getPostName(); + } + } + userE.setPostName(postName); + UserChangeRecordE userChangeRecordE = new UserChangeRecordE(); + userChangeRecordE.initUserAdd(userE, corpName, departmentName); + userChangeRecordGateway.add(userChangeRecordE); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java index c9fe1daf..4cb7290a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java @@ -28,6 +28,8 @@ import com.zcloud.basic.info.persistence.repository.UserJobHandoverRepository; import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.zclouddomain.facade.ZcloudDomainFacade; import com.zcloud.gbscommon.zclouddomain.request.DomainWorkChangeCmd; +import com.zcloud.gbscommon.zcloudedu.facade.ZcloudEduWorkFacade; +import com.zcloud.gbscommon.zcloudedu.request.EduWorkChangeCmd; import com.zcloud.gbscommon.zcloudeightwork.facade.ZcloudEightWorkFacade; import com.zcloud.gbscommon.zcloudeightwork.request.EightWorkChangeCmd; import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade; @@ -97,6 +99,9 @@ public class UserChangeRecordWorkChangeExe { @DubboReference private ZcloudTechnologyFacade zcloudTechnologyFacade; + @DubboReference + private ZcloudEduWorkFacade zcloudEduWorkFacade; + /** * 工作交接处理入口。 * 先根据工作类型调用对应三方系统，再关闭当前交接记录； @@ -171,6 +176,9 @@ public class UserChangeRecordWorkChangeExe { case TECHNOLOGY: processTechnologyInfoHandover(handoverDO, workChangeUpdateCmd); return; + case EDU_WORK: + processEduWorkInfoHandover(handoverDO, workChangeUpdateCmd); + return; default: log.warn("工作类型暂未接入交接微服务，交接记录id:{}, 工作类型:{}", handoverDO.getId(), handoverDO.getWorkType()); @@ -443,6 +451,43 @@ public class UserChangeRecordWorkChangeExe { throw new BizException("科技兴安交接失败，请稍后重试"); } } + + /** + * 处理线下培训交接。 + * 调用方式与其他工作类型保持一致，失败时记录日志，不中断整体流程。 + */ + private void processEduWorkInfoHandover(UserJobHandoverDO handoverDO, WorkChangeUpdateCmd workChangeUpdateCmd) { + EduWorkChangeCmd eduWorkChangeCmd = new EduWorkChangeCmd(); + eduWorkChangeCmd.setWorkId(handoverDO.getForeignKey()); + eduWorkChangeCmd.setOldUserId(handoverDO.getUserId()); + eduWorkChangeCmd.setUserId(workChangeUpdateCmd.getHandoverUserId()); + eduWorkChangeCmd.setUserName(workChangeUpdateCmd.getHandoverUserName()); + eduWorkChangeCmd.setDeptId(workChangeUpdateCmd.getHandoverDepartmentId()); + eduWorkChangeCmd.setDeptName(workChangeUpdateCmd.getHandoverDepartmentName()); + eduWorkChangeCmd.setCorpId(workChangeUpdateCmd.getHandoverCompanyId()); + eduWorkChangeCmd.setCorpName(workChangeUpdateCmd.getHandoverCompanyName()); + + log.info("开始处理线下培训交接，交接记录id:{}, workId:{}, 原责任人:{}, 新责任人:{}", + handoverDO.getId(), + handoverDO.getForeignKey(), + handoverDO.getUserId(), + workChangeUpdateCmd.getHandoverUserId()); + try { + SingleResponse response = zcloudEduWorkFacade.updateWorkChange(eduWorkChangeCmd); + if (response == null || !response.isSuccess()) { + String errMessage = response == null ? "线下培训服务未返回结果" : response.getErrMessage(); + log.error("线下培训交接失败，交接记录id:{}, workId:{}, 原因:{}", + handoverDO.getId(), handoverDO.getForeignKey(), errMessage); +// return; + throw new BizException(StringUtils.hasText(errMessage) ? errMessage : "线下培训交接失败"); + } + log.info("线下培训交接完成，交接记录id:{}, workId:{}, 新责任人:{}", + handoverDO.getId(), handoverDO.getForeignKey(), workChangeUpdateCmd.getHandoverUserId()); + } catch (Exception e) { + log.error("线下培训交接发生异常，交接记录id:{}, workId:{}", + handoverDO.getId(), handoverDO.getForeignKey(), e); + } + } private void processRiskInfoHandover(UserJobHandoverDO handoverDO, WorkChangeUpdateCmd workChangeUpdateCmd) { ListManagerWorkChangeCmd listManagerWorkChangeCmd = new ListManagerWorkChangeCmd(); listManagerWorkChangeCmd.setListManagerId(handoverDO.getForeignKey()); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java index 726bf5e8..67ac9ea8 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java @@ -8,16 +8,23 @@ import com.alibaba.cola.exception.BizException; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.response.UserDetailCO; import com.zcloud.basic.info.constant.RedisConstant; +import com.zcloud.basic.info.domain.enums.UserChangeRecordStatusEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; +import com.zcloud.basic.info.domain.gateway.UserChangeRecordGateway; import com.zcloud.basic.info.domain.gateway.UserGateway; +import com.zcloud.basic.info.domain.model.UserChangeRecordE; +import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.dto.AppUserLogOutCmd; import com.zcloud.basic.info.persistence.dataobject.UserDO; +import com.zcloud.basic.info.persistence.dataobject.UserJobHandoverDO; import com.zcloud.basic.info.persistence.repository.UserCorpRecordRepository; +import com.zcloud.basic.info.persistence.repository.UserJobHandoverRepository; import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +43,9 @@ import java.util.List; public class UserRemoveExe { private final UserGateway userGateway; private final UserRepository userRepository; + private final UserChangeRecordGateway userChangeRecordGateway; + private final UserJobHandoverRepository userJobHandoverRepository; + private final HumanUserUpdateExe humanUserUpdateExe; @DubboReference(check = false) private UserFacade userFacade; // @Autowired @@ -45,6 +55,13 @@ public class UserRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { try { + UserDO userDO = userRepository.getInfoById(id); + if (userDO != null) { + boolean canDelete = addDeleteChangeRecord(userDO); + if (!canDelete) { + return true; + } + } userGateway.deletedUserById(id); } catch (Exception e){ e.printStackTrace(); @@ -53,6 +70,42 @@ public class UserRemoveExe { return true; } + /** + * 删除用户时补充变更记录，并同步保存当前未完成的工作交接任务。 + * 该场景只记录变更前信息，变更后企业、部门、岗位信息保持为空。 + */ + private boolean addDeleteChangeRecord(UserDO userDO) { + UserE userE = new UserE(); + BeanUtils.copyProperties(userDO, userE); + + UserChangeRecordE userChangeRecordE = new UserChangeRecordE(); + userChangeRecordE.executeResignation( + userE, + UserEmploymentFlagEnum.RESIGNATION.getCode(), + UserChangeRecordStatusEnum.PENDING.getCode(), + userDO.getEmploymentFlag()); + userChangeRecordE.setUserNameBefore(userDO.getName()); + userChangeRecordE.setUserNameAfter(null); + userChangeRecordGateway.add(userChangeRecordE); + + List allJob = humanUserUpdateExe.collectUserJob( + userDO.getId(), + userDO.getDepartmentId(), + userDO.getCorpinfoId(), + userChangeRecordE.getUserChangeRecordId()); + if (CollUtil.isNotEmpty(allJob)) { + userJobHandoverRepository.saveBatch(allJob); + UserE updateUserE = new UserE(); + updateUserE.setId(userDO.getId()); + updateUserE.setEmploymentFlag(UserEmploymentFlagEnum.INFO_CHANGE.getCode()); + userGateway.update(updateUserE); + return false; + } + userChangeRecordE.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode()); + userChangeRecordGateway.update(userChangeRecordE); + return true; + } + @Transactional(rollbackFor = Exception.class) public boolean executeLogOut(AppUserLogOutCmd cmd) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index fc612380..9ae9ce91 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -85,6 +85,7 @@ public class UserUpdateExe { BeanUtils.copyProperties(userDO, oldUserE); // boolean transferPositionFlag = userE.verifyTransferPosition(oldUserE, userE); boolean transferFlowFlag = userE.verifyTransferFlow(oldUserE, userE); + boolean nameChanged = userUpdateCmd.getName() != null && !Objects.equals(userDO.getName(), userUpdateCmd.getName()); if (transferFlowFlag) { List userCorpRecordDOList = userCorpRecordRepository.getInfoListByUserId(userDO.getId()); if (CollUtil.isNotEmpty(userCorpRecordDOList)) { @@ -179,6 +180,9 @@ public class UserUpdateExe { }else { throw new BizException("未找到该用户所属企业"); } + if (nameChanged) { + addUserChangeRecordForNameUpdate(userDO); + } @@ -207,6 +211,27 @@ public class UserUpdateExe { } + /** + * 普通编辑场景下姓名发生变化时，补充一条用户变更记录。 + * 该记录只在姓名实际变更后新增，避免影响其他普通修改逻辑。 + */ + private void addUserChangeRecordForNameUpdate(UserDO oldUserDO) { + UserDO newUserDO = userRepository.getInfoById(oldUserDO.getId()); + if (newUserDO == null) { + log.warn("用户编辑后未查询到最新用户信息，跳过姓名变更记录，用户id:{}", oldUserDO.getId()); + return; + } + + UserE oldUserE = new UserE(); + BeanUtils.copyProperties(oldUserDO, oldUserE); + UserE newUserE = new UserE(); + BeanUtils.copyProperties(newUserDO, newUserE); + + UserChangeRecordE userChangeRecordE = new UserChangeRecordE(); + userChangeRecordE.initUserUpdate(newUserE, oldUserE, newUserDO.getCorpinfoName(), newUserDO.getDepartmentName()); + userChangeRecordGateway.add(userChangeRecordE); + } + @Transactional(rollbackFor = Exception.class) public void editData(UserQryCmd userUpdateCmd) { List userDOList = new ArrayList<>(); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java index fb11662c..5e47e264 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java @@ -38,7 +38,11 @@ public enum UserJobHandoverWorkTypeEnum { /** * 科技兴安。 */ - TECHNOLOGY(8, "科技兴安"); + TECHNOLOGY(8, "科技兴安"), + /** + * 线下培训。 + */ + EDU_WORK(9, "线下培训"); private final Integer code; private final String name; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index ad643c89..f9962aeb 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -4,7 +4,6 @@ import com.alibaba.cola.domain.Entity; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.domain.model.BaseE; -import com.zcloud.basic.info.domain.enums.CorpStateEnum; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; @@ -14,7 +13,6 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Map; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index d023270d..5226ea96 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -1,10 +1,7 @@ package com.zcloud.basic.info.domain.model; import cn.hutool.core.collection.CollUtil; -import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.domain.model.BaseE; import com.jjb.saas.framework.utils.DataEncryptDecryptUtil; @@ -12,25 +9,18 @@ import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; import com.zcloud.basic.info.domain.enums.UserTypeEnum; -import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; -import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity; import com.zcloud.gbscommon.utils.ExcelUtils; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; import com.zcloud.gbscommon.utils.Tools; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang.StringUtils; import org.springframework.util.ObjectUtils; -import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 291f4e0b..5cc4b2b6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -481,6 +481,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id) .eq("delete_enum", "FALSE") + .set("employment_flag", "0") .set("delete_enum", "TRUE"); update(updateWrapper); userFacade.delete(id); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/utils/SyncPageResponse.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/utils/SyncPageResponse.java index 5484efc8..0b31e8fe 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/utils/SyncPageResponse.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/utils/SyncPageResponse.java @@ -3,7 +3,6 @@ package com.zcloud.basic.info.utils; import cn.hutool.core.util.ObjectUtil; import com.alibaba.cola.dto.Response; import com.alibaba.fastjson.JSONObject; -import com.zcloud.gbscommon.utils.Sm2Util; import org.slf4j.MDC; import java.util.Collections;