zcloud_gbs
/
zcloud_gbs_basic_info_gwj
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(user): 修复用户离职处理中的角色设置和删除操作

dev_human_push
zhaokai 2026-06-30 17:50:36 +08:00
parent 627f41e68e
commit 33e3598981
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java
View File

@ -53,7 +53,7 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade {
@Override @Override
public MultiResponse<ZcloudPostCO> listByPostIds(ZcloudPostQry qry){ public MultiResponse<ZcloudPostCO> listByPostIds(ZcloudPostQry qry){
if(qry == null || qry.getPostIds() == null || qry.getPostIds().length == 0){ if(qry == null ){
return null; return null;
} }

12
web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java
View File

@ -228,7 +228,7 @@ public class HumanUserUpdateExe {
UserEmploymentFlagEnum.RESIGNATION.getCode(), UserEmploymentFlagEnum.RESIGNATION.getCode(),
"TRUE"); "TRUE");
completeResignation(oldUserDO, userChangeRecordE); completeResignation(oldUserDO, userChangeRecordE);
return createEntryUserByChangeRecord(oldUserDO, userChangeRecordE); return createEntryUserByChangeRecord(oldUserDO, userChangeRecordE, userUpdateCmd.getRoleId());
} }
/** /**
@ -421,8 +421,8 @@ public class HumanUserUpdateExe {
* @param userChangeRecordE 变更记录 * @param userChangeRecordE 变更记录
* @return 新企业用户 id * @return 新企业用户 id
*/ */
private Long createEntryUserByChangeRecord(UserDO oldUserDO, UserChangeRecordE userChangeRecordE) { private Long createEntryUserByChangeRecord(UserDO oldUserDO, UserChangeRecordE userChangeRecordE, Long roleId) {
UserAddCmd userAddCmd = buildCrossCorpUserAddCmd(oldUserDO, userChangeRecordE); UserAddCmd userAddCmd = buildCrossCorpUserAddCmd(oldUserDO, userChangeRecordE, roleId);
Long userId = userAddExe.executeHumanUser(userAddCmd); Long userId = userAddExe.executeHumanUser(userAddCmd);
UserE userE = buildUserE(userAddCmd, userId); UserE userE = buildUserE(userAddCmd, userId);
@ -465,7 +465,7 @@ public class HumanUserUpdateExe {
* @param userChangeRecordE 变更记录 * @param userChangeRecordE 变更记录
* @return 新企业入职命令 * @return 新企业入职命令
*/ */
private UserAddCmd buildCrossCorpUserAddCmd(UserDO oldUserDO, UserChangeRecordE userChangeRecordE) { private UserAddCmd buildCrossCorpUserAddCmd(UserDO oldUserDO, UserChangeRecordE userChangeRecordE, Long roleId) {
UserAddCmd userAddCmd = new UserAddCmd(); UserAddCmd userAddCmd = new UserAddCmd();
BeanUtils.copyProperties(oldUserDO, userAddCmd); BeanUtils.copyProperties(oldUserDO, userAddCmd);
userAddCmd.setCorpinfoId(userChangeRecordE.getCorpinfoIdAfter()); userAddCmd.setCorpinfoId(userChangeRecordE.getCorpinfoIdAfter());
@ -480,6 +480,9 @@ public class HumanUserUpdateExe {
? userChangeRecordE.getUserNameAfter() ? userChangeRecordE.getUserNameAfter()
: oldUserDO.getName()); : oldUserDO.getName());
userAddCmd.setUserId(oldUserDO.getUserId()); userAddCmd.setUserId(oldUserDO.getUserId());
if (roleId != null) {
userAddCmd.setRoleId(roleId);
}
return userAddCmd; return userAddCmd;
} }
@ -495,6 +498,7 @@ public class HumanUserUpdateExe {
log.info("开始调用底座离职接口，用户id:{}", userId); log.info("开始调用底座离职接口，用户id:{}", userId);
try { try {
Response quit = userFacade.quit(quitCmd); Response quit = userFacade.quit(quitCmd);
userFacade.delete(userId);
if (quit == null || !quit.isSuccess()) { if (quit == null || !quit.isSuccess()) {
String errMessage = quit == null ? "底座未返回结果" : quit.getErrMessage(); String errMessage = quit == null ? "底座未返回结果" : quit.getErrMessage();
log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage); log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage);

1
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -684,6 +684,7 @@ public class UserAddExe {
} }
userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId()); userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId());
userEmploymentLogGateway.add(userEmploymentLogE); userEmploymentLogGateway.add(userEmploymentLogE);
// addUserChangeRecordForSave(userE, corpInfoDO);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }

1
web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java
View File

@ -681,6 +681,7 @@ public class UserChangeRecordWorkChangeExe {
log.info("开始调用底座离职接口，用户id:{}", userId); log.info("开始调用底座离职接口，用户id:{}", userId);
try { try {
Response response = userFacade.quit(quitCmd); Response response = userFacade.quit(quitCmd);
userFacade.delete(userId);
if (response == null || !response.isSuccess()) { if (response == null || !response.isSuccess()) {
String errMessage = response == null ? "底座未返回结果" : response.getErrMessage(); String errMessage = response == null ? "底座未返回结果" : response.getErrMessage();
log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage); log.error("底座离职处理失败，用户id:{}, 原因:{}", userId, errMessage);