From d57c5e9d1cfe1829ee06a65bf40dffaa54ffeb09 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 23 Jun 2026 14:42:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(user):=20=E8=A7=A3=E5=86=B3=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E5=92=8C=E8=B7=A8?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8F=98=E6=9B=B4=E5=8A=9F=E8=83=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/command/HumanUserUpdateExe.java | 8 ++++++++ .../basic/info/command/UserChangeRecordWorkChangeExe.java | 8 ++++++++ .../basic/info/dto/clientobject/UserChangeRecordCO.java | 3 ++- .../src/main/resources/mapper/UserChangeRecordMapper.xml | 4 ++-- .../src/main/resources/mapper/UserMapper.xml | 6 +++++- 5 files changed, 25 insertions(+), 4 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 ddb16b56..023f2edb 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 @@ -406,6 +406,14 @@ public class HumanUserUpdateExe { UserE userE = buildUserE(userAddCmd, userId); createOrUpdateCurrentCorpRecord(userE, userAddCmd.getCorpinfoName(), userAddCmd.getDepartmentName()); +// createAddChangeRecord(userE, userAddCmd.getCorpinfoName(), userAddCmd.getDepartmentName()); + UserChangeRecordE userChangeRecordENew = new UserChangeRecordE(); + BeanUtils.copyProperties(userChangeRecordE, userChangeRecordENew); + userChangeRecordENew.setId(null); + userChangeRecordENew.setUserChangeRecordId(null); + userChangeRecordENew.setUserId(userId); + userChangeRecordENew.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode()); + userChangeRecordGateway.add(userChangeRecordENew); log.info("跨企业变更新企业入职完成，原用户id:{}, 新用户id:{}, 新企业id:{}", oldUserDO.getId(), userId, userAddCmd.getCorpinfoId()); return userId; 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 32f1feb2..d7516e1a 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 @@ -444,8 +444,16 @@ public class UserChangeRecordWorkChangeExe { Long newUserId = createEntryUserByChangeRecord(userDO, userChangeRecordDO); log.info("跨企业变更工作交接收口完成新企业入职，原用户id:{}, 新用户id:{}, 变更记录:{}", userDO.getId(), newUserId, userChangeRecordId); + UserChangeRecordE userChangeRecordENew = new UserChangeRecordE(); + BeanUtils.copyProperties(userChangeRecordDO, userChangeRecordENew); + userChangeRecordENew.setId(null); + userChangeRecordENew.setUserChangeRecordId(null); + userChangeRecordENew.setUserId(newUserId); + userChangeRecordENew.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode()); + userChangeRecordGateway.add(userChangeRecordENew); } updateUserChangeRecord(userChangeRecordDO); + } /** diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java index e3edd9c4..5dc94e3e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java @@ -8,6 +8,7 @@ import lombok.Data; import java.time.LocalDateTime; import java.time.LocalDate; +import java.util.Date; import java.util.List; /** @@ -30,7 +31,7 @@ public class UserChangeRecordCO extends ClientObject { //变更时间 @ApiModelProperty(value = "变更时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime changeTime; + private Date changeTime; //入职状态，1-待审批, 2-通过 @ApiModelProperty(value = "入职状态，1-待审批, 2-通过") private Integer status; diff --git a/web-infrastructure/src/main/resources/mapper/UserChangeRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/UserChangeRecordMapper.xml index b88c1c13..33e92b59 100644 --- a/web-infrastructure/src/main/resources/mapper/UserChangeRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserChangeRecordMapper.xml @@ -21,8 +21,8 @@ LEFT JOIN user u ON ucr.user_id = u.id ucr.delete_enum = 'FALSE' - - AND ucr.user_id = #{params.userId} + + AND ucr.user_id = #{params.eqUserId} AND ucr.status = #{params.status} diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 8c2ab6e3..9612a9a9 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -7,7 +7,10 @@ select c.corp_name as corpinfoName, d.name as department_name, - p.post_name, + CASE + WHEN c.type IN (3,4, 5) THEN u.post_name + ELSE p.post_name + END AS post_name, u.id, u.user_id, u.username, @@ -248,6 +251,7 @@ u.political_affiliation_name, u.employment_flag, u.flow_flag, + u.rz_flag, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN