From e8600599f37932f95befb90aae7d00e70903a7c7 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 21 Jul 2025 11:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=87=8D=E5=A4=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E7=AD=9B=E9=80=89=E8=AF=81=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zdxt/domain/auth/User.java       | 10 ++++++++++
 .../controller/AppEnterpriseInformationController.java |  4 ++--
 .../src/main/resources/mapper/system/UserMapper.xml    |  6 ++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
index 2d452b75..c76fd4ea 100644
--- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
@@ -214,6 +214,8 @@ public class User extends BaseDomain {
 
     private String notUserId;
 
+    private Integer isShowCardId;
+
     public String getNotUserId() {
         return notUserId;
     }
@@ -699,5 +701,13 @@ public class User extends BaseDomain {
                 ", kingdeeUserId='" + kingdeeUserId + '\'' +
                 "} " + super.toString();
     }
+
+    public Integer getIsShowCardId() {
+        return isShowCardId;
+    }
+
+    public void setIsShowCardId(Integer isShowCardId) {
+        this.isShowCardId = isShowCardId;
+    }
 }
 
diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
index e40d8578..ef78819e 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
@@ -79,11 +79,11 @@ public class AppEnterpriseInformationController extends BaseController
 //        startPage();
         List<EnterpriseInformation> list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation);
 //        return getDataTable(list);
-
+        long total = Math.min(list.size(), 60);
         TableDataInfo rspData = getDataTable(list);
         rspData.setCode(0);
         rspData.setRows(list);
-        rspData.setTotal(60);
+        rspData.setTotal(total);
         return rspData;
     }
 
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index cc609419..ffd5b6b1 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -204,8 +204,10 @@
                 #{uid}
             </foreach>
         </if>
---         AND  u.law_certificate_num is not null
---         AND  u.law_certificate_num !=""
+        <if test="isShowCardId != null and isShowCardId == 0">
+                AND  u.law_certificate_num is not null
+                AND  u.law_certificate_num !=""
+        </if>
              and u.dept_id != 405
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 数据范围过滤 -->