From 4bb54af508d19fd6550d4b51a6a8163e007ec166 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Sun, 20 Jul 2025 20:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E4=BC=81=E6=A3=80=E6=9F=A5=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E3=80=81=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E3=80=81=E5=B7=A5=E4=BD=9C=E6=8A=A5=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E6=89=A7=E6=B3=95=E5=88=86=E6=9E=90=E3=80=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=94=BB=E5=83=8F-=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=BF=9D=E5=AD=98=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ComprehensiveAnalysisMapper.xml   | 3 +++
 .../resources/mapper/EnforcementCheckStatisticsMapper.xml   | 1 +
 .../main/resources/mapper/EnforcementRegistrationMapper.xml | 6 ++++++
 .../src/main/resources/mapper/Zfryjdm2405301Mapper.xml      | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
index 80f76153..743debc3 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
@@ -22,6 +22,7 @@
         <where>
             and r.enterprise_number is not null
             and r.check_category is not null
+            and r.is_submit=1
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or
                 r.law_enforcer_id_two like concat('%',#{userId}, '%'))
             </if>
@@ -59,6 +60,7 @@
         <where>
             and r.enterprise_number is not null
             and r.check_category is not null
+            and r.is_submit=1
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or
                 r.law_enforcer_id_two like concat('%',#{userId}, '%'))
             </if>
@@ -96,6 +98,7 @@
         <where>
             and r.enterprise_number is not null
             and r.check_category is not null
+            and r.is_submit=1
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or
                 r.law_enforcer_id_two like concat('%',#{userId}, '%'))
             </if>
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
index 1530e9d2..381edd6e 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
@@ -64,6 +64,7 @@
                 and e.is_complaint is not null
                 and e.check_category is not null
                 and e.bureau_dept_id is not null
+                and e.is_submit=1
                 <if test="qy != null  and qy != ''">
                     and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                     <if test="jd != null  and jd != ''">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index b2b2c92b..aadbbae1 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -278,6 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, count( enterprise_number ) AS num
         from enforcement_registration
         <where>
+        and is_submit=1
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
@@ -361,6 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEnforcementRegistrationByEpId" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
         <include refid="selectEnforcementRegistrationVo"/>
         <where>
+            and is_submit=1
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
@@ -433,6 +435,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and is_complaint is not null
             and check_category is not null
             and bureau_dept_id is not null
+            and is_submit=1
             <if test="deptQx != null  and deptQx != ''">and bureau_dept_id =#{deptQx}</if>
             <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
             <if test="bureauDeptName != null  and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
@@ -507,6 +510,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and r.is_complaint is not null
             and r.check_category is not null
             and r.bureau_dept_id is not null
+            and is_submit=1
             <if test="qy != null  and qy != ''">
                 and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
@@ -972,6 +976,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and r.is_complaint is not null
             and r.check_category is not null
             and r.bureau_dept_id is not null
+            and r.is_submit=1
             <if test="qy != null  and qy != ''">
                 and (enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
                 <if test="jd != null  and jd != ''">
@@ -1043,6 +1048,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and is_complaint is not null
             and check_category is not null
             and bureau_dept_id is not null
+            and is_submit=1
             <if test="enterpriseName != null and enterpriseName != ''">
                 AND enterprise_name like concat(concat('%',#{enterpriseName}),'%')
             </if>
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
index 3a31830d..8d6e0873 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZfryjdmByDeptId" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
         select name, zzjgdm, #{zfdw} as zfdw, sub_name, zfcode, sfzcode_encrypt,x.dept_id as deptId,phoneNumber as phoneNumber,ancestors as ancestors,
-        (select count(*) from enforcement_registration where law_enforcer_id=x.user_id or law_enforcer_id_two=x.user_id) as number from
+        (select count(*) from enforcement_registration where (law_enforcer_id=x.user_id or law_enforcer_id_two=x.user_id) and is_submit=1) as number from
         (select* from
         (select name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt from zfryjdm2405301
         <where>