From 03e213b9669eefff5fb93d3e655a9dbc9bb84630 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 27 Jun 2025 16:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/service/impl/EnforcementRegistrationServiceImpl.java | 3 ++-
 .../main/resources/mapper/EnforcementRegistrationMapper.xml   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index 0fbafced..77892599 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@@ -206,7 +206,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     }
 
     @Override
-//    @DataScope
+    @DataScope
     public List<EnforcementRegistration> selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> enforcementRegistrations =
@@ -215,6 +215,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     }
 
     @Override
+    @DataScope
     public List<EnforcementRegistration> selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> enforcementRegistrations =
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 74cc2dbb..f14a68d3 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -390,6 +390,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 and enforcement_time &lt;= #{params.endTime}
             </if>
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         order by enforcement_time desc
     </select>