From df307c233af968431f1b23b102cb07d16cf5ef90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 7 Sep 2021 14:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java        | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 7e369b1f..96fc3a60 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -406,25 +406,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 break;
             case PayIncomeContractCommon.PROJECT_TYPE2:
                 // 工作组项目
-                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payIncomeContractAssociated.getProjectId());
-                if(Objects.isNull(payWorkingGroup)){
-                    throw new JeroBootException("工作组项目不存在！");
-                }
-                LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
-                queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId());
-                queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payIncomeContract.getSignedCompanyId());
-                List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
-                if(CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
+                PayWorkingGroupSubItem listPayWorkingGroupSubItem = payWorkingGroupSubItemService.getById(payIncomeContractAssociated.getProjectId());
+                if(Objects.isNull(listPayWorkingGroupSubItem)){
                     throw new JeroBootException("工作组成员单位不存在！");
                 }
                 // 更新项目id
-                payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
+                payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.getId());
                 // todo 不是打包企业 取消打包 将关联项目取消打包
                 LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0);
-                updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
+                updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId());
                 payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
                 break;
             case PayIncomeContractCommon.PROJECT_TYPE3: