From 33e35989815873ad07343eda7173a516e764d424 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 30 Jun 2026 17:50:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(user):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=A6=BB=E8=81=8C=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=AE=BE=E7=BD=AE=E5=92=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/facade/ZcloudPostFacadeImpl.java | 2 +- .../basic/info/command/HumanUserUpdateExe.java | 12 ++++++++---- .../com/zcloud/basic/info/command/UserAddExe.java | 1 + .../info/command/UserChangeRecordWorkChangeExe.java | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java index 0b718ab3..4bcc7a47 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java @@ -53,7 +53,7 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade { @Override public MultiResponse listByPostIds(ZcloudPostQry qry){ - if(qry == null || qry.getPostIds() == null || qry.getPostIds().length == 0){ + if(qry == null ){ return null; } 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 ad10a6f0..092fb8e4 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 @@ -228,7 +228,7 @@ public class HumanUserUpdateExe { UserEmploymentFlagEnum.RESIGNATION.getCode(), "TRUE"); completeResignation(oldUserDO, userChangeRecordE); - return createEntryUserByChangeRecord(oldUserDO, userChangeRecordE); + return createEntryUserByChangeRecord(oldUserDO, userChangeRecordE, userUpdateCmd.getRoleId()); } /** @@ -421,8 +421,8 @@ public class HumanUserUpdateExe { * @param userChangeRecordE 变更记录 * @return 新企业用户 id */ - private Long createEntryUserByChangeRecord(UserDO oldUserDO, UserChangeRecordE userChangeRecordE) { - UserAddCmd userAddCmd = buildCrossCorpUserAddCmd(oldUserDO, userChangeRecordE); + private Long createEntryUserByChangeRecord(UserDO oldUserDO, UserChangeRecordE userChangeRecordE, Long roleId) { + UserAddCmd userAddCmd = buildCrossCorpUserAddCmd(oldUserDO, userChangeRecordE, roleId); Long userId = userAddExe.executeHumanUser(userAddCmd); UserE userE = buildUserE(userAddCmd, userId); @@ -465,7 +465,7 @@ public class HumanUserUpdateExe { * @param userChangeRecordE 变更记录 * @return 新企业入职命令 */ - private UserAddCmd buildCrossCorpUserAddCmd(UserDO oldUserDO, UserChangeRecordE userChangeRecordE) { + private UserAddCmd buildCrossCorpUserAddCmd(UserDO oldUserDO, UserChangeRecordE userChangeRecordE, Long roleId) { UserAddCmd userAddCmd = new UserAddCmd(); BeanUtils.copyProperties(oldUserDO, userAddCmd); userAddCmd.setCorpinfoId(userChangeRecordE.getCorpinfoIdAfter()); @@ -480,6 +480,9 @@ public class HumanUserUpdateExe { ? userChangeRecordE.getUserNameAfter() : oldUserDO.getName()); userAddCmd.setUserId(oldUserDO.getUserId()); + if (roleId != null) { + userAddCmd.setRoleId(roleId); + } return userAddCmd; } @@ -495,6 +498,7 @@ public class HumanUserUpdateExe { log.info("开始调用底座离职接口，用户id:{}", userId); try { Response quit = userFacade.quit(quitCmd); + userFacade.delete(userId); if (quit == null || !quit.isSuccess()) { String errMessage = quit == null ? "底座未返回结果" : quit.getErrMessage(); log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage); 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 f0b143a9..cef68a82 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 @@ -684,6 +684,7 @@ public class UserAddExe { } userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId()); userEmploymentLogGateway.add(userEmploymentLogE); +// addUserChangeRecordForSave(userE, corpInfoDO); } catch (Exception e) { throw new RuntimeException(e); } 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 4cb7290a..cb9f9b2c 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 @@ -681,6 +681,7 @@ public class UserChangeRecordWorkChangeExe { log.info("开始调用底座离职接口，用户id:{}", userId); try { Response response = userFacade.quit(quitCmd); + userFacade.delete(userId); if (response == null || !response.isSuccess()) { String errMessage = response == null ? "底座未返回结果" : response.getErrMessage(); log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage);