From 325f74d893fcd0de7f85d67527e9e447b631c4cd Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 9 Sep 2021 15:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/controller/PayDataFileController.java     |  4 ++--
 .../mapper/xml/PayCaseCommitteeSubitemMapper.xml   | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
index b0e8759c..0029eb5d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
@@ -165,7 +165,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 			@ApiImplicitParam(name = "fileIds", value = "资料id,多个以逗号隔开",required = true),
 			@ApiImplicitParam(name = "dataType", value = "文件类型，资料1或者会议2",required = true)
 	})
-	@PostMapping(value = "/add")
+	@GetMapping(value = "/add")
 	@Transactional
 	public Result<?> add(@RequestParam(name="dataId") String dataId,
 						 @RequestParam(name="fileIds") String fileIds,
@@ -207,7 +207,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	 */
 	@AutoLog(value = "资料维护(资料和会议)-编辑")
 	@ApiOperation(value="资料维护(资料和会议)-编辑", notes="资料维护(资料和会议)-编辑")
-	@PostMapping(value = "/edit")
+	@GetMapping(value = "/edit")
 	@Transactional
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "dataId",value = "目录id",required = true),
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 2e2d2f27..72054e2f 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
@@ -23,12 +23,14 @@
          pay_case_committee_subitem pm
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) where pm.committee_id = #{id}
         ${wrapper2.customSqlSegment}
-<!--        <if test="#{companyName} != null  and  #{companyName} !=''">-->
-<!--            and pm.company_name=#{companyName}-->
-<!--        </if>-->
-<!--        <if test="#{name} != null  and  #{name} !=''">-->
-<!--            and pt.name=#{name}-->
-<!--        </if>-->
+        <where>
+        <if test="#{companyName} != null  and  #{companyName} !=''">
+            and pm.company_name=#{companyName}
+        </if>
+        <if test="#{name} != null  and  #{name} !=''">
+            and pt.name=#{name}
+        </if>
+        </where>
     </select>