From 5cece322012436e7f2aa9fb2850c011415c7de74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 6 Sep 2021 11:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/PayWorkingGroupSubItemController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 43780358..0c9ebf08 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -145,11 +145,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  *  查询工作组成员是否收费通知
 	  *
 	  * @param ids 工作组成员ids 逗号分隔
+	  * @param workingGroupId 工作组id
 	  * @return
 	  */
 	 @ApiOperation(value="工作组成员-查询工作组成员是否收费通知", notes="工作组成员-查询工作组成员是否收费通知")
 	 @GetMapping(value = "/getCharge")
-	 public Result<?> getCharge(@RequestParam(name = "ids") String ids) {
+	 public Result<?> getCharge(@RequestParam(name = "ids") String ids,@RequestParam(name = "workingGroupId") String workingGroupId) {
 		 if(StringUtils.isBlank(ids)){
 			 return Result.error("id不能为空!");
 		 }
@@ -161,6 +162,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 }
 		 LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
 		 query.in(PayWorkingGroupSubItem::getId,Arrays.asList(ids.split(",")));
+		 query.eq(PayWorkingGroupSubItem::getWorkingGroupId,workingGroupId);
 		 List<PayWorkingGroupSubItem> list = payWorkingGroupSubItemService.list();
 		 if(!CollectionUtils.isEmpty(list)){
 			 List<PayWorkingGroupSubItem> listNew = list.stream().filter(p->!Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)).collect(Collectors.toList());