From fa1b7ad6ae4b41f1908f0c77e5867ac7621b646d Mon Sep 17 00:00:00 2001
From: shenzhidan <hezhiqiang@zcloudchina.com>
Date: Tue, 10 Feb 2026 09:20:00 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=81=E4=B9=A6=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D=E6=94=B9=E4=B8=BA=E4=BC=81=E4=B8=9A=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../query/CorpCertificateQueryExe.java        |  5 +++++
 .../query/UserCertificateQueryExe.java        |  5 +++++
 .../mapper/UserCertificateMapper.xml          | 21 ++++++++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java
index 552d02a..8fe6938 100644
--- a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java
@@ -80,8 +80,13 @@ public class CorpCertificateQueryExe {
      * 判断证书编号是否存在
      */
     public boolean  checkCertNoExist(String certNo, Long id) {
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if (ssoUser == null || ssoUser.getTenantId() == null || certNo == null || certNo.trim().isEmpty()) {
+            return false;
+        }
         return corpCertificateRepository.count(new LambdaQueryWrapper<CorpCertificateDO>()
                 .eq(CorpCertificateDO::getCertificateCode, certNo)
+                .eq(CorpCertificateDO::getCorpinfoId, ssoUser.getTenantId())
                 .ne(id != null, CorpCertificateDO::getId, id)
         ) > 0;
     }
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 9f11d2b..5e46e45 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
@@ -133,8 +133,13 @@ public class UserCertificateQueryExe {
      * 查询证书编号是否存在
      */
     public boolean checkCertNoExist(String certNo, Long id) {
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if (ssoUser == null || ssoUser.getTenantId() == null || certNo == null || certNo.trim().isEmpty()) {
+            return false;
+        }
         return userCertificateRepository.count(new LambdaQueryWrapper<UserCertificateDO>()
                 .eq(UserCertificateDO::getCertificateCode, certNo)
+                .eq(UserCertificateDO::getCorpinfoId, ssoUser.getTenantId())
                 .ne(id != null, UserCertificateDO::getId, id)
         ) > 0;
     }
diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
index c7b0fc4..5fb2a5c 100644
--- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml
@@ -22,8 +22,15 @@
             department d ON d.id = u.department_id
         LEFT JOIN
             post p ON p.id = u.post_id
-        WHERE 1=1
-            AND uc.delete_enum = 'false'
+        WHERE
+            uc.delete_enum = 'false'
+
+            <if test="params.eqType != null and params.eqType != ''">
+                AND uc.type = #{params.eqType}
+            </if>
+            <if test="params.eqCorpinfoId != null and params.eqCorpinfoId != ''">
+                AND uc.corpinfo_id = #{params.eqCorpinfoId}
+            </if>
             <if test="params.tenantId != null">
                 AND uc.tenant_id = #{params.tenantId}
             </if>
@@ -46,12 +53,6 @@
             <if test="params.eqAssignmentOperatingItemsCode != null and params.eqAssignmentOperatingItemsCode != ''">
                 AND uc.assignment_operating_items_code = #{params.eqAssignmentOperatingItemsCode}
             </if>
-            <if test="params.eqType != null and params.eqType != ''">
-                AND uc.type = #{params.eqType}
-            </if>
-            <if test="params.eqCorpinfoId != null and params.eqCorpinfoId != ''">
-                AND uc.corpinfo_id = #{params.eqCorpinfoId}
-            </if>
             <if test="params.likePostName != null and params.likePostName != ''">
                 AND uc.post_name LIKE CONCAT('%', #{params.likePostName}, '%')
             </if>
@@ -80,8 +81,8 @@
         department d ON d.id = u.department_id
         LEFT JOIN
         post p ON p.id = u.post_id
-        WHERE 1=1
-        AND uc.delete_enum = 'false'
+        WHERE
+            uc.delete_enum = 'false'
         <if test="params.tenantId != null">
             AND uc.tenant_id = #{params.tenantId}
         </if>