From 7244fa52bb3b3dc7e64195ecfdd63adac2d6da55 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Fri, 15 Oct 2021 14:42:28 +0800
Subject: [PATCH] fix bug

---
 .../controller/PayCaseCommitteeSubitemController.java  |  5 ++++-
 .../data/mapper/xml/PayCaseCommitteeSubitemMapper.xml  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
index 62357314..68bb5d9b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
@@ -158,9 +158,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 											@RequestParam(name = "ids",required = false) String ids,
 											@RequestParam(name="companyName",required =false) String companyName,
 											@RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName) {
+		String contactsNames = oConvertUtils.replaceAllPercent(contactsName);
+		String companyNames = oConvertUtils.replaceAllPercent(companyName);
+		String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName);
 //		ids为空表示搜索导出
 		if (StringUtils.isBlank(ids)) {
-			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName);
+			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsNames, companyNames, fenBiaoWeiNames);
 			return getModelAndView(list);
 		} else {
 			ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index e511dc3a..9c2f428f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -21,13 +21,13 @@
         left join pay_company_management pcm on(pm.company_id=pcm.id)
         <where>
             <if test=" name!=null and name != ''">
-                AND pt.name LIKE CONCAT('%',#{name},'%') escape '/'
+                AND pt.name LIKE CONCAT('%',#{name},'%')
             </if>
             <if test=" companyName!=null and companyName != ''">
-                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/'
+                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
             </if>
             <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
-                AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') escape '/'
+                AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
         group by pe.id
@@ -41,10 +41,10 @@
         <where>
             pm.committee_id = #{pid}
             <if test=" companyName!=null and companyName != ''">
-                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/'
+                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
             </if>
             <if test=" tname!=null and tname != ''">
-                AND pt.name LIKE CONCAT('%',#{tname},'%') escape '/'
+                AND pt.name LIKE CONCAT('%',#{tname},'%')
             </if>
         </where>
         order by pm.create_time desc