diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml index a3c45a1..4f1ff68 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml @@ -267,16 +267,16 @@ where b.audit_status = 1 - and b.pro_name like concat('%',#{proName},'%') ESCAPE '/' + and b.pro_name like concat('%',#{proName},'%') - and b.depart_name like concat('%',#{departName},'%') ESCAPE '/' + and b.depart_name like concat('%',#{departName},'%') - and a.dev_name like concat('%',#{devName},'%') ESCAPE '/' + and a.dev_name like concat('%',#{devName},'%') - and a.dev_code like concat('%',#{devCode},'%') ESCAPE '/' + and a.dev_code like concat('%',#{devCode},'%') diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml index 2652c08..19f8a25 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml @@ -38,13 +38,13 @@ left join tb_bd_device_record tbd on tbd.record_id = tbr.id where del_flag = 0 - and tbr.depart_name like concat('%',#{departName},'%') ESCAPE '/' + and tbr.depart_name like concat('%',#{departName},'%') - and tbr.pro_name like concat('%',#{proName},'%') ESCAPE '/' + and tbr.pro_name like concat('%',#{proName},'%') - and tbr.rel_user like concat('%',#{relUser},'%') ESCAPE '/' + and tbr.rel_user like concat('%',#{relUser},'%') and DATE_FORMAT(tbr.create_time, '%Y-%m-%d') = #{applyTime} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml index 153cbb9..8d2973b 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml @@ -48,7 +48,7 @@ WHERE tddr.is_warn = '1' - and tddr.dev_name like concat('%',#{devName},'%') ESCAPE '/' + and tddr.dev_name like concat('%',#{devName},'%') and tddr.dev_type = #{devType} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml index 18bbabe..4cc1d9a 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml @@ -286,10 +286,10 @@ and td.dev_type = #{devType} - and td.dev_name like concat('%',#{devName},'%') ESCAPE '/' + and td.dev_name like concat('%',#{devName},'%') - and td.dev_code like concat('%',#{devCode},'%') ESCAPE '/' + and td.dev_code like concat('%',#{devCode},'%') and td.dev_status = #{devStatus} @@ -343,10 +343,10 @@ and td.dev_type = #{devTypeCode} - and td.dev_name like concat('%',#{devName},'%') ESCAPE '/' + and td.dev_name like concat('%',#{devName},'%') - and td.dev_code like concat('%',#{devCode},'%') ESCAPE '/' + and td.dev_code like concat('%',#{devCode},'%') @@ -374,10 +374,10 @@ left join tb_bd_record tbr on tbdr.record_id = tbr.id and tbr.del_flag = 0 where tbr.audit_status = 1 and tp.del_flag = 0 - and tbdr.dev_name like concat('%',#{devName},'%') ESCAPE '/' + and tbdr.dev_name like concat('%',#{devName},'%') - and tbdr.dev_code like concat('%',#{devCode},'%') ESCAPE '/' + and tbdr.dev_code like concat('%',#{devCode},'%') and tbdr.dev_status = #{devStatus} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml index 650a755..a3ce5e6 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml @@ -20,7 +20,7 @@ and tp.team_id = #{id} - and tp.rel_name like concat('%',#{relName},'%') ESCAPE '/' + and tp.rel_name like concat('%',#{relName},'%') and tp.sex = #{sex} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProDepartMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProDepartMapper.xml index 8c3760c..1612a63 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProDepartMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProDepartMapper.xml @@ -26,10 +26,10 @@ and tpd.area_id = #{areaId} - and tpd.depart_name like concat('%',#{departName},'%') ESCAPE '/' + and tpd.depart_name like concat('%',#{departName},'%') - and tpd.head_user like concat('%',#{headUser},'%') ESCAPE '/' + and tpd.head_user like concat('%',#{headUser},'%') ORDER BY tpd.create_time DESC diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml index 4d3624b..b1e26df 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml @@ -11,7 +11,7 @@ and tb.pro_id = #{id} - and tb.gt_name like concat('%',#{gtName},'%') ESCAPE '/' + and tb.gt_name like concat('%',#{gtName},'%') diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml index 64102fb..901dea7 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml @@ -31,7 +31,7 @@ and tb.id = #{id} - and tb.pro_name like concat('%',#{proName},'%') ESCAPE '/' + and tb.pro_name like concat('%',#{proName},'%') and tb.rel_id = #{relId} @@ -43,7 +43,7 @@ and tb.pro_type = #{proType} - and tpd.depart_name like concat('%',#{departName},'%') ESCAPE '/' + and tpd.depart_name like concat('%',#{departName},'%') and tb.depart_id = #{departId} diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml index 18c4b63..e1984a0 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml @@ -25,19 +25,19 @@ and id = #{id} - and tt.team_name like concat('%',#{teamName},'%') ESCAPE '/' + and tt.team_name like concat('%',#{teamName},'%') - and tt.rel_name like concat('%',#{relName},'%') ESCAPE '/' + and tt.rel_name like concat('%',#{relName},'%') and ( - tt.team_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/' - OR tt.rel_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/' - OR tt.pro_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/' + tt.team_name LIKE CONCAT('%', #{keyWord}, '%') + OR tt.rel_name LIKE CONCAT('%', #{keyWord}, '%') + OR tt.pro_name LIKE CONCAT('%', #{keyWord}, '%') OR CASE WHEN tt.js_time IS NULL THEN '正常' ELSE '已解散' END - LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/' + LIKE CONCAT('%', #{keyWord}, '%') ) GROUP BY tt.id diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbUserPostMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbUserPostMapper.xml index b2de25c..6e78065 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbUserPostMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbUserPostMapper.xml @@ -14,10 +14,10 @@ and create_time = #{createTime} - and post_name like concat('%',#{postName},'%') ESCAPE '/' + and post_name like concat('%',#{postName},'%') - and rel_name like concat('%',#{relName},'%') ESCAPE '/' + and rel_name like concat('%',#{relName},'%') diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml index 5449f8d..ebad316 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml @@ -410,7 +410,7 @@ and twc.configu_type = #{configuType} - and twc.config_name like concat('%',#{configName},'%') ESCAPE '/' + and twc.config_name like concat('%',#{configName},'%') and td.id = #{devId} diff --git a/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml index a639c51..3be324b 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml @@ -41,7 +41,7 @@ and td.dev_type = #{devTypeCode} - and tp.pro_name like concat('%',#{proName},'%') ESCAPE '/' + and tp.pro_name like concat('%',#{proName},'%') @@ -127,7 +127,7 @@ where tp.del_flag = 0 - and tp.pro_name like concat('%',#{proName},'%') ESCAPE '/' + and tp.pro_name like concat('%',#{proName},'%') diff --git a/bonus-modules/base/src/main/resources/mapper/base/screen/TeamRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/screen/TeamRecordMapper.xml index b6052f7..4ede74b 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/screen/TeamRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/screen/TeamRecordMapper.xml @@ -36,10 +36,10 @@ AND tt.pro_id = #{proId} - and tt.team_name like concat('%',#{teamName},'%') ESCAPE '/' + and tt.team_name like concat('%',#{teamName},'%') - and tt.rel_name like concat('%',#{masterName},'%') ESCAPE '/' + and tt.rel_name like concat('%',#{masterName},'%') group by tt.id @@ -59,7 +59,7 @@ AND tt.pro_id = #{proId} - and tp.rel_name like concat('%',#{peopleName},'%') ESCAPE '/' + and tp.rel_name like concat('%',#{peopleName},'%') and tp.post_code = #{postCode}