From 0f8427ba4176bf5532338b9f25118dace278c8d9 Mon Sep 17 00:00:00 2001
From: shenzhidan <hezhiqiang@zcloudchina.com>
Date: Mon, 2 Feb 2026 14:34:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=86=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/certificate/domain/model/UserBasicInfo.java |  3 +++
 .../main/resources/mapper/CorpCertificateMapper.xml    |  4 ++--
 .../main/resources/mapper/UserCertificateMapper.xml    | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

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 0fd8e35..3ec9a6f 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
@@ -27,4 +27,7 @@ public class UserBasicInfo {
     @ApiModelProperty(value = "岗位名称")
     private String postName;
 
+    @ApiModelProperty(value = "用户岗位名称")
+    private String userPostName;
+
 }
diff --git a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml
index 63c0f4b..ec3863d 100644
--- a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml
@@ -32,8 +32,8 @@
         1 = 1
         <if test="params.corpType != null">
             AND (
-            (#{params.corpType} = 0 AND ci.type IN (0,1))
-            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
+            (#{params.corpType} = 0 AND ci.type IN (0,1,6))
+            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
             )
         </if>
 
diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
index b2bb54c..b5763ef 100644
--- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
@@ -12,7 +12,7 @@
             u.employment_flag AS employmentStatus,
             d.name            AS departmentName,
             p.corpinfo_name   AS corpinfoName,
-            p.post_name       AS postName
+            uc.post_name       AS postName
         FROM
             user_certificate uc
         LEFT JOIN
@@ -63,7 +63,7 @@
         u.employment_flag AS employmentStatus,
         d.name            AS departmentName,
         p.corpinfo_name   AS corpinfoName,
-        p.post_name       AS postName
+        uc.post_name       AS postName
         FROM
         user_certificate uc
         LEFT JOIN
@@ -117,7 +117,7 @@
     <select id="selectUserNamesByUserIds" resultType="com.zcloud.certificate.domain.model.UserBasicInfo">
         SELECT
             u.id                AS userId,
-            u.username              AS userName,
+            u.username          AS userName,
             u.name              AS name,
             d.name              AS departmentName,
             c.corp_name         AS corpinfoName,
@@ -184,8 +184,8 @@
 
             <if test="params.corpType != null">
                 AND (
-                (#{params.corpType} = 0 AND ci.type IN (0,1))
-                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
+                (#{params.corpType} = 0 AND ci.type IN (0,1,6))
+                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
                 )
             </if>