diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
index b4a22659..80f76153 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
@@ -23,7 +23,7 @@
and r.enterprise_number is not null
and r.check_category is not null
and( r.law_enforcer_id=#{userId} or
- r.law_enforcer_id_two=#{userId})
+ r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -60,7 +60,7 @@
and r.enterprise_number is not null
and r.check_category is not null
and( r.law_enforcer_id=#{userId} or
- r.law_enforcer_id_two=#{userId})
+ r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -97,7 +97,7 @@
and r.enterprise_number is not null
and r.check_category is not null
and( r.law_enforcer_id=#{userId} or
- r.law_enforcer_id_two=#{userId})
+ r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -134,7 +134,7 @@
and r.check_category is not null
and e.id is not null
and( r.law_enforcer_id=#{userId} or
- r.law_enforcer_id_two=#{userId})
+ r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -210,7 +210,7 @@
and (c.rid is not null or c.complaint_department_id is not null)
and c.enforce_type is not null
and( r.law_enforcer_id=#{userId} or
- r.law_enforcer_id_two=#{userId})
+ r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and( r.bureau_dept_id=#{bureauDeptId} or
c.complaint_department_id=#{bureauDeptId})
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
index 18e330bc..a0b65ed8 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
@@ -141,7 +141,7 @@
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
@@ -193,7 +193,7 @@
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -245,7 +245,7 @@
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
@@ -777,7 +777,7 @@
and r.bureau_dept_id is not null
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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})
@@ -882,7 +882,7 @@
and r.bureau_dept_id is not null
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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})
@@ -946,7 +946,7 @@
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
@@ -1006,7 +1006,7 @@
and r.unite_check is not null
and r.unite_check is null
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and r.bureau_dept_id=#{bureauDeptId}
and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
@@ -1149,7 +1149,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1177,7 +1177,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
@@ -1209,7 +1209,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
@@ -1234,7 +1234,7 @@
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})
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1257,7 +1257,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1396,7 +1396,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1419,7 +1419,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
@@ -1446,7 +1446,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))
and DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
@@ -1470,7 +1470,7 @@
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})
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1497,7 +1497,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
@@ -1524,7 +1524,7 @@
and (r.union_no is not null and r.union_no != '')
and (r.union_no is null or r.union_no = '')
- and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
+ 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')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')