1、增加用户姓名字段

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());
+            if (userBasicInfo != null) {
                 e.attach(userBasicInfo);
+            }
         });
     }
 

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-安全生产管理人员

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;
 

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();

web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml

@@ -58,7 +58,8 @@
     <select id="selectPageUser" resultType="com.zcloud.certificate.persistence.dataobject.UserCertificateDO">
         SELECT
         uc.*,
-        u.name        AS userName,
+        u.username        AS userName,
+        u.name            AS name,
         u.employment_flag AS employmentStatus,
         d.name            AS departmentName,
         p.corpinfo_name   AS corpinfoName,
@@ -117,6 +118,7 @@
         SELECT
             u.id                AS userId,
             u.name              AS userName,
+            u.name              AS name,
             d.name              AS departmentName,
             p.corpinfo_name     AS corpinfoName,
             p.post_name         AS postName,