From 1ea94757955a453a1f57156b7b2d93abb7f5b354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 18 Sep 2021 18:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/service/impl/PayIncomeContractServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 cb6b34fd..c54c7927 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
@@ -275,7 +275,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         setPayIncomeContract(payIncomeContract,payIncomeContractStatus);
         // 先删除临时表企业信息，联系人信息，邮寄联系人信息
         payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
-        payContactsManagementTemporaryService.removeByIds(Arrays.asList(payIncomeContract.getSignedContactsTemporaryId()));
+        payContactsManagementTemporaryService.removeByIds(Collections.singletonList(payIncomeContract.getSignedContactsTemporaryId()));
         payIncomeContractService.updateById(payIncomeContract);
     }
 
@@ -340,6 +340,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     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)){
                         throw new JeroBootException("工作组成员单位不存在！");
@@ -348,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     if(!Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),payIncomeContract.getSignedCompanyId())){
                         throw new JeroBootException("企业不匹配！");
                     }
+
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),listPayWorkingGroupSubItem.get(0).getId());
                     // 合同选择打包,运行年份不是打包企业，添加打包企业
@@ -398,6 +400,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>();
                     queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getProjectId,payMemberProject.getId());
+                    queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payIncomeContract.getSignedCompanyId());
                     List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem);
                     if(CollectionUtils.isEmpty(listPayMemberProjectSubitem)){
                         throw new JeroBootException("会员项目成员单位不存在！");