From 928bcdc25e6361add74b27ec3f38d7fb65e20e56 Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Tue, 20 Jan 2026 09:26:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificate/command/query/UserCertificateQueryExe.java | 4 +++- .../certificate/dto/clientobject/UserCertificateCO.java | 2 ++ .../com/zcloud/certificate/domain/model/UserBasicInfo.java | 3 +++ .../zcloud/certificate/domain/model/UserCertificateE.java | 3 +++ .../src/main/resources/mapper/UserCertificateMapper.xml | 6 ++++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java index 53ca180..8eff762 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java @@ -121,7 +121,9 @@ public class UserCertificateQueryExe { userCertificateES.forEach(e -> { UserBasicInfo userBasicInfo = userInfoMap.get(e.getUserId()); - e.attach(userBasicInfo); + if (userBasicInfo != null) { + e.attach(userBasicInfo); + } }); } diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java index 07d8d07..a07563f 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java @@ -31,6 +31,8 @@ public class UserCertificateCO extends ClientObject { private Long userId; @ApiModelProperty(value = "用户名称") private String userName; + @ApiModelProperty(value = "用户姓名") + private String name; @ApiModelProperty(value = "在职状态 0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核") private Integer employmentStatus; //1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员 diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserBasicInfo.java b/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserBasicInfo.java index eb9ca74..0fd8e35 100644 --- a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserBasicInfo.java +++ b/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserBasicInfo.java @@ -12,6 +12,9 @@ public class UserBasicInfo { @ApiModelProperty(value = "用户名称") private String userName; + @ApiModelProperty(value = "用户姓名") + private String name; + @ApiModelProperty(value = "在职状态 0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核") private Integer employmentStatus; diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java b/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java index c9479b0..7cb900b 100644 --- a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java +++ b/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java @@ -60,6 +60,8 @@ public class UserCertificateE extends BaseE { private LocalDate reviewDate; //用户名 private String userName; + //姓名 + private String name; //在职状态 private Integer employmentStatus; //部门名称 @@ -70,6 +72,7 @@ public class UserCertificateE extends BaseE { public void attach(UserBasicInfo userBasicInfo) { if (userBasicInfo == null) return; this.userName = userBasicInfo.getUserName(); + this.name = userBasicInfo.getName(); this.employmentStatus = userBasicInfo.getEmploymentStatus(); this.departmentName = userBasicInfo.getDepartmentName(); this.corpinfoName = userBasicInfo.getCorpinfoName(); diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index beec67a..2ae5f41 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -58,7 +58,8 @@ SELECT u.id AS userId, - u.name AS userName, + u.name AS userName, + u.name AS name, d.name AS departmentName, p.corpinfo_name AS corpinfoName, p.post_name AS postName,