执法端-查询全市本单位修改

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

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;
+
 }

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>