From 2bcd6ce445c61718b8864c0ad78adce4faaa11cc Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Mon, 25 May 2026 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=A8=E5=B8=82=E6=9C=AC=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enforcement/AppEnforcementRegistrationController.java    | 3 ++-
 .../enforcementcode/domain/bo/EnforcementRegistrationBo.java | 5 +++++
 .../mapper/enforcementcode/EnforcementRegistrationMapper.xml | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
index 563855ea..3cfdf6f7 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
@@ -101,11 +101,12 @@ public class AppEnforcementRegistrationController extends BaseController {
     /**
      * 执法端-查询执法记录-全市-本单位
      */
+    @SaIgnore
     @GetMapping("/queryList")
     @ResponseBody
     public R<EnforcementRegistrationVo> queryList(EnforcementRegistrationBo bo, PageQuery pageQuery) {
         // dateType本单位 0 全市 1
-        if (Objects.nonNull(bo.getUserId()) && bo.getDateType()==0) {
+        if (Objects.nonNull( LoginHelper.getUserId()) && bo.getWarnType()==0) {
             bo.setDeptId(LoginHelper.getDeptId() == null ? null : LoginHelper.getDeptId());
 
             SysDeptVo bureauDept = sysDeptService.iterationDeptParentToBureau(LoginHelper.getDeptId());
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
index 4cd39cca..3014ca37 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java
@@ -315,4 +315,9 @@ public class EnforcementRegistrationBo extends BaseEntity {
     private String region;
     private String regionId;
 
+    /**
+     * 提醒类型 0：本单位 1：全市
+     */
+    private Integer warnType;
+
 }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
index 315534a4..138da585 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
@@ -562,6 +562,10 @@
             <if test="bo.num != null and bo.num != ''">
                 and t.num &gt;= #{bo.num}
             </if>
+            <!-- <if test="bo.deptId != null and bo.warnType!=null and bo.warnType ==0" >
+               and t.bureau_dept_id = #{bo.deptId}
+              </if>-->
+            <!-- 数据范围过滤 -->
         </where>
         order by t.num desc
     </select>