diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java
index 97d64600..a76838f4 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java
@@ -1,5 +1,6 @@
package com.zdxt.enforcementcode.controller.web.supervision.report;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo;
import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo;
import com.zdxt.enforcementcode.domain.vo.report.ChartDataVo;
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
index a9dfb9a1..c964bf7a 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml
@@ -46,8 +46,11 @@
AND is_complaint = #{bo.isComplaint}
-
- AND enforce = #{bo.enforce}
+ }
+ AND enforce_reason is null
+
+
+ AND enforce_reason is not null
AND check_css = #{bo.checkCss}
@@ -146,7 +149,7 @@
AND (law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
- ORr. law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
+ OR r2.law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
AND r2.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
@@ -169,8 +172,11 @@
AND r2.is_complaint = #{bo.isComplaint}
-
- AND r2.enforce = #{bo.enforce}
+ }
+ AND r2.enforce_reason is null
+
+
+ AND r2.enforce_reason is not null
AND r2.check_css = #{bo.checkCss}
@@ -241,8 +247,8 @@
AND r.bureau_dept_name LIKE CONCAT('%', #{bo.bureauDeptName}, '%')
- AND (law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
- ORr. law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
+ AND (r.law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
+ OR r.law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
AND r.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
@@ -265,8 +271,11 @@
AND r.is_complaint = #{bo.isComplaint}
-
- AND r.enforce = #{bo.enforce}
+ }
+ AND r.enforce_reason is null
+
+
+ AND r.enforce_reason is not null
AND r.check_css = #{bo.checkCss}
@@ -411,8 +420,11 @@
AND er.is_complaint = #{bo.isComplaint}
-
- AND er.enforce = #{bo.enforce}
+
+ AND er.enforce_reason is null
+
+
+ AND er.enforce_reason is not null
AND er.check_css = #{bo.checkCss}