From 78805be6c39130e26b47155080063daccc432432 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, 18 Oct 2021 13:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40863?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayPayMemberProjectSubitemServiceImpl.java   | 4 ++--
 .../com/jero/pack/service/impl/PayPackCompanyServiceImpl.java | 2 +-
 .../project/controller/PayWorkingGroupSubItemController.java  | 4 ++--
 .../project/service/impl/PayCommonProjectServiceImpl.java     | 4 ++--
 .../service/impl/PayWorkingGroupSubItemServiceImpl.java       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
index f7cbe544..279029cf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
@@ -145,10 +145,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		// 校验项目是否已关联合同
 		PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payMemberProjectSubitem.getId());
 		if(!Objects.isNull(payIncomeContract)){
-			if(!Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
+			if(!Objects.equals(payMemberProjectSubitem.getPaymentMethod(),payMemberProjectSubitem1.getPaymentMethod())){
 				throw new JeroBootException("项目已关联合同，来款方式不可修改！");
 			}
-			if(!Objects.equals(payIncomeContract.getContractNum(),payMemberProjectSubitem.getContractNo())){
+			if(Objects.equals(payMemberProjectSubitem1.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payMemberProjectSubitem1.getContractNo(),payMemberProjectSubitem.getContractNo())){
 				throw new JeroBootException("项目已关联合同，合同编号不可修改！");
 			}
 		}else{
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
index 76d7bdae..755608de 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
@@ -161,7 +161,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
             payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId());
         }
         // 打包联系人
-        if(!Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompanyOld.getPackContactId())){
+        if(!Objects.equals(payPackCompanyOld.getPackContactTemporaryId(),payPackCompany.getPackContactId())){
             PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payPackCompany.getPackContactId());
             if(Objects.isNull(mailContactsName)){
                 throw new JeroBootException("打包联系人名称为空！");
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 68e0f04f..27e40550 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
@@ -179,7 +179,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
 			 LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
 			 queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
-			 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
+			 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE2);
 			 List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
 			 if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
 				 List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
@@ -194,7 +194,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
 			 LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
 			 queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
-			 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
+			 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2);
 			 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
 			 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
 				 List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index 6b54cc6d..b5221ddf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -145,10 +145,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
         // 校验项目是否已关联合同
         PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payCommonProjectOld.getId());
         if(!Objects.isNull(payIncomeContract)){
-            if(!Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+            if(!Objects.equals(payCommonProject.getChargeWay(),payCommonProjectOld.getChargeWay())){
                 throw new JeroBootException("项目已关联合同，来款方式不可修改！");
             }
-            if(!Objects.equals(payIncomeContract.getContractNum(),payCommonProject.getContractNum())){
+            if(Objects.equals(payCommonProjectOld.getChargeWay(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payCommonProjectOld.getContractNum(),payCommonProject.getContractNum())){
                 throw new JeroBootException("项目已关联合同，合同编号不可修改！");
             }
         }else{
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index 1f664b3b..f6b06066 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -228,10 +228,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         // 校验项目是否已关联合同
         PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(payWorkingGroupSubItem.getId());
         if(!Objects.isNull(payIncomeContract)){
-            if(!Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+            if(!Objects.equals(payWorkingGroupSubItem.getChargeWay(),payWorkingGroupSubItemOld.getChargeWay())){
                 throw new JeroBootException("项目已关联合同，来款方式不可修改！");
             }
-            if(!Objects.equals(payIncomeContract.getContractNum(),payWorkingGroupSubItem.getContractNum())){
+            if(Objects.equals(payWorkingGroupSubItemOld.getChargeWay(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payWorkingGroupSubItemOld.getContractNum(),payWorkingGroupSubItem.getContractNum())){
                 throw new JeroBootException("项目已关联合同，合同编号不可修改！");
             }
         }else{