From 0704ff3750b8c8dc5f8d246685f2cfc1c8a7888d Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Fri, 20 Mar 2026 16:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=85=A8=E9=83=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=20=E5=87=86=E5=A4=87=E6=8B=89=E6=96=B0=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxt/common/util/IdCardCryptoUtil.java | 12 ++-- .../framework/config/ResourcesConfig.java | 5 ++ .../interceptor/SourceMapInterceptor.java | 26 ++++++++ .../src/main/resources/application-dev.yml | 6 +- .../src/main/resources/application.yml | 8 +-- .../project/code/statistical/home.html | 2 +- .../mapper/StatisticalPanelMapper.xml | 62 +++++++++---------- 7 files changed, 78 insertions(+), 43 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/interceptor/SourceMapInterceptor.java diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java index ae13de55..326a6065 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java +++ b/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 diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java index c9b27c80..2111e777 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java +++ b/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", diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/interceptor/SourceMapInterceptor.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/interceptor/SourceMapInterceptor.java new file mode 100644 index 00000000..d2d9b1a0 --- /dev/null +++ b/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; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml index 2c5b4451..a95744dd 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-dev.yml +++ b/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: diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml index d36ebb3c..ddb55606 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml +++ b/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 diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html index 453d1176..118ff3f5 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html +++ b/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) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml index b2f9151f..e252d507 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml +++ b/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}) - 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}) and r.unite_check is not null and r.unite_check is null @@ -191,7 +191,7 @@ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and r.unite_check is not null and r.unite_check is null @@ -244,7 +244,7 @@ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and r.unite_check is not null and r.unite_check is null @@ -783,7 +783,7 @@ and r.unite_check is null and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) - 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}) @@ -895,7 +895,7 @@ and r.unite_check is null and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) - 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}) @@ -957,7 +957,7 @@ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and r.unite_check is not null and r.unite_check is null @@ -1018,7 +1018,7 @@ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and r.unite_check is not null and r.unite_check is null @@ -1154,7 +1154,7 @@ and r.bureau_dept_id is not null - 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}) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1179,7 +1179,7 @@ and (r.union_no IS NOT NULL and r.union_no != '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1208,7 +1208,7 @@ and (r.union_no IS NOT NULL and r.union_no != '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1233,7 +1233,7 @@ and r.bureau_dept_id is not null - 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}) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1263,7 +1263,7 @@ and r.union_no IS NOT NULL and r.union_no != '' and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1294,7 +1294,7 @@ and (r.union_no IS NOT NULL and r.union_no != '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1329,7 +1329,7 @@ and (r.union_no IS NOT NULL and r.union_no != '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1364,7 +1364,7 @@ and (r.union_no is null or r.union_no = '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1388,7 +1388,7 @@ and r.union_no is not null and r.union_no != '' and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1416,7 +1416,7 @@ and (r.union_no is null or r.union_no = '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1444,7 +1444,7 @@ and r.union_no is not null and r.union_no != '' and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1476,7 +1476,7 @@ and (r.union_no is null or r.union_no = '') and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1504,7 +1504,7 @@ and r.union_no is not null and r.union_no != '' and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and r.bureau_dept_name like concat('%', #{area}, '%') and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -1536,7 +1536,7 @@ and r.bureau_dept_id is not null and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1562,7 +1562,7 @@ and r.bureau_dept_id is not null and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1730,7 +1730,7 @@ and r.bureau_dept_id is not null and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1758,7 +1758,7 @@ and r.bureau_dept_id is not null and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1790,7 +1790,7 @@ and r.bureau_dept_id is not null and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1820,7 +1820,7 @@ and r.bureau_dept_id is not null - 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}) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1869,7 +1869,7 @@ and r.bureau_dept_id is not null - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1898,7 +1898,7 @@ and r.bureau_dept_id is not null - 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}) and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') @@ -1927,7 +1927,7 @@ and r.bureau_dept_id is not null - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1956,7 +1956,7 @@ and r.bureau_dept_id is not null - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') @@ -1990,7 +1990,7 @@ and r.bureau_dept_id is not null - 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}) and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '')