先全部提交 准备拉新分支

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -32,11 +32,11 @@ public class IdCardCryptoUtil {
         String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
         System.out.println("====================== 示例 ======================");
         // 加密
-        String source_dec = "15914090216";
+        String source_dec = "13640840165";
         String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
         System.out.println(source_dec+" 加密后 : "+enc);
         // 解密
-        String source_enc = "SNe91sgGKxtErs+UX/lE7w==";
+        String source_enc = "wDLyWcBO/fIH2rJpSGN98A==";
         String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc);
         System.out.println(source_enc+" 解密后 : "+dec);
 
@@ -51,8 +51,12 @@ public class IdCardCryptoUtil {
 
         System.out.println("====================== 实用 ======================");
         String[] strings={
-                "18926034339",
-                "18038193067",
+                "13360957126",
+                "16688211945",
+                "17339838670",
+                "18460319603",
+                "15626498490",
+                "18080147218",
         };
 
 //        刘义	13410900924	19020722074

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java

@@ -38,6 +38,9 @@ public class ResourcesConfig implements WebMvcConfigurer
     @Autowired
     private XssFilter xssFilter;
 
+    @Autowired
+    private com.zdxt.auth.framework.interceptor.SourceMapInterceptor sourceMapInterceptor;
+
     /**
      * 默认首页的设置，当输入域名是可以自动跳转到默认指定的网页
      */
@@ -75,6 +78,8 @@ public class ResourcesConfig implements WebMvcConfigurer
     public void addInterceptors(InterceptorRegistry registry)
     {
 //        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+        // 拦截 .map 文件请求，防止前端源代码泄露
+        registry.addInterceptor(sourceMapInterceptor).addPathPatterns("/**/*.map");
         registry.addInterceptor(new JWTInterceptor())
                 .addPathPatterns("/app/**")
                 .excludePathPatterns("/app/thirdLogin/siqLogin","/app/thirdLogin/siqLoginTest",

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/interceptor/SourceMapInterceptor.java

@@ -0,0 +1,26 @@
+package com.zdxt.auth.framework.interceptor;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 拦截 .map 文件请求，防止前端源代码泄露
+ *
+ * @author security-fix
+ */
+@Component
+public class SourceMapInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String uri = request.getRequestURI();
+        if (uri != null && uri.endsWith(".map")) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return false;
+        }
+        return true;
+    }
+}

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
 #    host: 10.76.108.1
 #    port: 6379
 #    password: zfjd@123
-    host: 43.136.51.161
-    port: 6379
-    password: meiyoumima
+    host: 127.0.0.1
+    port: 6380
+    password:
     timeout: 6000ms           # 连接超时时长（毫秒）
     lettuce:
       pool:

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -81,12 +81,12 @@ spring:
       # 启用cas单点登录环境
       #      - cas
       # 启用mysql版本
-      - druidDev
-      - dev
+#      - druidDev
+#      - dev
 #      - druidTest
 #      - test
-#      - druidPro
-#      - pro
+      - druidPro
+      - pro
 
       #分布式任务中心
       #      - job

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html

@@ -197,7 +197,7 @@
   var rightAct = false;
 
   $(function(){
-    // changeDate();
+    changeDate();
   });
 
   function changeDate(time1, time2) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml

@@ -138,7 +138,7 @@
                 and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
             </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
@@ -191,7 +191,7 @@
                 and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
             </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
@@ -244,7 +244,7 @@
                 and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
             </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
@@ -783,7 +783,7 @@
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
 <!--            <if test="qy != null  and qy != ''">-->
 <!--                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or-->
@@ -895,7 +895,7 @@
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
 <!--            <if test="qy != null  and qy != ''">-->
 <!--                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or-->
@@ -957,7 +957,7 @@
                 and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
             </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
@@ -1018,7 +1018,7 @@
                 and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
             </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>
             <if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
@@ -1154,7 +1154,7 @@
         and r.bureau_dept_id is not null
 <!--        <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
 <!--        <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>-->
         <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1179,7 +1179,7 @@
         and (r.union_no IS NOT NULL and r.union_no != '')
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1208,7 +1208,7 @@
         and (r.union_no IS NOT NULL and r.union_no != '')
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1233,7 +1233,7 @@
         and r.bureau_dept_id is not null
 <!--        <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
 <!--        <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>-->
         <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1263,7 +1263,7 @@
             and r.union_no IS NOT NULL and r.union_no != ''
             <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
             <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1294,7 +1294,7 @@
         and (r.union_no IS NOT NULL and r.union_no != '')
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1329,7 +1329,7 @@
         and (r.union_no IS NOT NULL and r.union_no != '')
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1364,7 +1364,7 @@
             and (r.union_no is null or r.union_no = '')
             <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
             <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1388,7 +1388,7 @@
             and r.union_no is not null and r.union_no != ''
             <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
             <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1416,7 +1416,7 @@
         and (r.union_no is null or r.union_no = '')
         <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1444,7 +1444,7 @@
         and r.union_no is not null and r.union_no != ''
         <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1476,7 +1476,7 @@
         and (r.union_no is null or r.union_no = '')
         <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
         <if test="beginTime != null and beginTime != ''">
@@ -1504,7 +1504,7 @@
         and r.union_no is not null and r.union_no != ''
         <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="(deptId != null and deptId != '') and (area == null or area == '')">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="area != null and area != ''"> and r.bureau_dept_name like concat('%', #{area}, '%')</if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
@@ -1536,7 +1536,7 @@
         and r.bureau_dept_id is not null
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>
         <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1562,7 +1562,7 @@
         and r.bureau_dept_id is not null
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
         <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1730,7 +1730,7 @@
         and r.bureau_dept_id is not null
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
         <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1758,7 +1758,7 @@
         and r.bureau_dept_id is not null
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
         <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1790,7 +1790,7 @@
         and r.bureau_dept_id is not null
         <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
         <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
         <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1820,7 +1820,7 @@
         and r.bureau_dept_id is not null
 <!--        <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
 <!--        <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>-->
         <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1869,7 +1869,7 @@
             and r.bureau_dept_id is not null
 <!--            <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
             <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1898,7 +1898,7 @@
         and r.bureau_dept_id is not null
 <!--        <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
         <if test="deptId != null and deptId != ''">
-            and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+            and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
         </if>
 <!--        <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>-->
         <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
@@ -1927,7 +1927,7 @@
             and r.bureau_dept_id is not null
 <!--            <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
             <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1956,7 +1956,7 @@
             and r.bureau_dept_id is not null
             <!--            <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
             <if test="uniteCheck == '1'.toString()"> and (r.union_no is null or r.union_no = '')</if>
@@ -1990,7 +1990,7 @@
             and r.bureau_dept_id is not null
 <!--            <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
             <if test="deptId != null and deptId != ''">
-                and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId} or sd.area_node = #{deptId})
+                and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId})
             </if>
             <if test="uniteCheck == '0'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
             <if test="uniteCheck == '1'.toString()"> and (r.union_no is null or r.union_no = '')</if>