From e781b9a8881857cde621e79159d0da8a60613797 Mon Sep 17 00:00:00 2001 From: ganhao Date: Wed, 24 Jun 2026 16:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A7=E6=B3=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/enforcement/AppEnfEvaluateController.java | 2 ++ .../AppEnforcementInspectionProgramController.java | 1 + .../enforcement/AppEnforcementRegistrationController.java | 2 +- .../domain/bo/EnforcementRegistrationQueryBo.java | 5 +++++ .../service/impl/EnforcementRegistrationServiceImpl.java | 4 ++++ .../mapper/enforcementcode/EnforcementRegistrationMapper.xml | 4 ++++ 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java index 0538699b..2d10ecdc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -37,6 +38,7 @@ public class AppEnfEvaluateController extends BaseController { */ @GetMapping("/queryEvaluateList") public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) { + bo.setLawEnforcementId(LoginHelper.getDeptId()); return enforcementRegistrationService.queryEnforcementRegistrationPageList(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java index 2ab112e4..333962ba 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java @@ -64,6 +64,7 @@ public class AppEnforcementInspectionProgramController extends BaseController { @SaIgnore @GetMapping("/selectInspectionProgramList") public TableDataInfo selectInspectionProgramList(EnforcementInspectionProgramBo bo, PageQuery pageQuery) { + bo.setEnforcementDepartmentId(LoginHelper.getDeptId()); return enforcementInspectionProgramService.selectEnforcementInspectionProgramPage(bo, pageQuery); } 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 ee6bf117..abaaee95 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 @@ -542,7 +542,6 @@ public class AppEnforcementRegistrationController extends BaseController { @GetMapping("/list") public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { long startTime = System.currentTimeMillis(); - // 校验分页参数，防止全量查询 if (pageQuery.getPageSize() == null || pageQuery.getPageSize() <= 0) { pageQuery.setPageSize(10); @@ -551,6 +550,7 @@ public class AppEnforcementRegistrationController extends BaseController { pageQuery.setPageNum(1); } + bo.setLawEnforcementId(LoginHelper.getDeptId()); // 使用标准的分页查询方法 TableDataInfo pageResult = DataPermissionHelper.ignore(() -> enforcementRegistrationService.queryPageList(bo, pageQuery) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java index f7806883..1a4eaafc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java @@ -11,6 +11,11 @@ public class EnforcementRegistrationQueryBo implements Serializable { */ private String lawEnforcement; + /** + * 执法部门ID + */ + private String lawEnforcementId; + /** * 执法事项 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 05a6ef86..cba310b8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -873,6 +873,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnforcementRegistration::getBureauDeptId, bo.getBureauDeptId()); + // 执法部门ID过滤 + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), + EnforcementRegistration::getLawEnforcementId, bo.getLawEnforcementId()); + // 按执法时间倒序 lqw.orderByDesc(EnforcementRegistration::getEnforcementTime); 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 4c27dee4..46ada94d 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 @@ -147,6 +147,10 @@ AND law_enforcement = #{bo.lawEnforcement} + + + AND law_enforcement_id = #{bo.lawEnforcementId} + AND law_enforcement_item LIKE CONCAT('%', #{bo.lawEnforcementItem}, '%')