优化执法信息

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<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) {
+        bo.setLawEnforcementId(LoginHelper.getDeptId());
         return enforcementRegistrationService.queryEnforcementRegistrationPageList(bo, pageQuery);
     }
 

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<EnforcementInspectionProgramVo> selectInspectionProgramList(EnforcementInspectionProgramBo bo, PageQuery pageQuery) {
+        bo.setEnforcementDepartmentId(LoginHelper.getDeptId());
         return enforcementInspectionProgramService.selectEnforcementInspectionProgramPage(bo, pageQuery);
     }
 

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<EnforcementRegistrationVo> 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<EnforcementRegistrationVo> pageResult = DataPermissionHelper.ignore(() ->
             enforcementRegistrationService.queryPageList(bo, pageQuery)

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;
+
     /**
      * 执法事项
      */

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);
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml

@@ -147,6 +147,10 @@
             <if test="bo.lawEnforcement != null and bo.lawEnforcement != ''">
                 AND law_enforcement = #{bo.lawEnforcement}
             </if>
+            <!-- 执法部门ID过滤 -->
+            <if test="bo.lawEnforcementId != null and bo.lawEnforcementId != ''">
+                AND law_enforcement_id = #{bo.lawEnforcementId}
+            </if>
             <!-- 执法事项过滤 -->
             <if test="bo.lawEnforcementItem != null and bo.lawEnforcementItem != ''">
                 AND law_enforcement_item LIKE CONCAT('%', #{bo.lawEnforcementItem}, '%')