From c2ba2a8515c54a703b6042e6b784474eed494bee 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 14:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40547?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayCommonProjectServiceImpl.java | 15 +++++++++++----
 .../impl/PayWorkingGroupSubItemServiceImpl.java   | 14 ++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

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 b5221ddf..c8ec1a5c 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
@@ -241,12 +241,19 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     */
     private void deleteProject(String id){
         PayCommonProject payCommonProject = payCommonProjectService.getById(id);
-        // 到账！=0 || 开票！=0 || 邮寄！=0
-        if(!Objects.equals(payCommonProject.getInAccount(),PayProjectCommon.IN_ACCOUNT0)
-                || !Objects.equals(payCommonProject.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)
-                || !Objects.equals(payCommonProject.getMail(),PayProjectCommon.MAIL0)){
+        // 到账！=0
+        if(!Objects.equals(payCommonProject.getInAccount(),PayProjectCommon.IN_ACCOUNT0)){
             throw new JeroBootException("项目已有到账信息不可删除！");
         }
+        // 开票！=0
+        if(!Objects.equals(payCommonProject.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)){
+            throw new JeroBootException("项目已有开票信息不可删除！");
+        }
+        // 邮寄！=0
+        if(!Objects.equals(payCommonProject.getMail(),PayProjectCommon.MAIL0)){
+            throw new JeroBootException("项目已有邮寄信息不可删除！");
+        }
+
         // 校验项目是否已关联合同 抛异常
         payIncomeContractService.getPayIncomeContractAssociated(Collections.singletonList(payCommonProject.getId()));
         // 如果已打报，同步删除打包关联
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 f6b06066..4d73bef0 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
@@ -606,12 +606,18 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
      */
     private void deleteProject(String id){
         PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(id);
-        // 到账！=0 || 开票！=0 || 邮寄！=0
-        if(!Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0)
-                || !Objects.equals(payWorkingGroupSubItem.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)
-                || !Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0)){
+        // 到账！=0
+        if(!Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0)){
             throw new JeroBootException("项目已有到账信息不可删除！");
         }
+        // 开票！=0
+        if(!Objects.equals(payWorkingGroupSubItem.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0)){
+            throw new JeroBootException("项目已有开票信息不可删除！");
+        }
+        // 邮寄！=0
+        if(!Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0)){
+            throw new JeroBootException("项目已有邮寄信息不可删除！");
+        }
         // 校验项目是否已关联合同 抛异常
         payIncomeContractService.getPayIncomeContractAssociated(Collections.singletonList(payWorkingGroupSubItem.getId()));
         // 如果已打报，同步删除打包关联