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 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)) ) 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 @@