1、修改分公司、相关方类型统计

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;
+
 }

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))
+            (#{params.corpType} = 0 AND ci.type IN (0,1,6))
-            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
+            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
             )
         </if>
 

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))
+                (#{params.corpType} = 0 AND ci.type IN (0,1,6))
-                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
+                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
                 )
             </if>