From eb040dbe44b1b7ee00a0588e46f6cd778027ae37 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Tue, 14 Dec 2021 18:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86-=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayIncomeContractServiceImpl.java       | 9 ++++++---
 .../service/impl/PaySpendingContractServiceImpl.java     | 3 +++
 2 files changed, 9 insertions(+), 3 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 273be5bf..7b33a638 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
@@ -1030,6 +1030,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 payIncomeContractAssociatedCancellation.setId(null);
                 payIncomeContractAssociatedCancellation.setAssociatedId(p.getId());
                 list.add(payIncomeContractAssociatedCancellation);
+
+
+
             });
             payIncomeContractAssociatedCancellationService.saveBatch(list);
         }
@@ -1098,9 +1101,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS3)){
             throw new JeroBootException("收入合同不可归档！");
         }
-        if(Objects.isNull(payIncomeContractAudit.getContractStatus())
-                || !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS5)
-                || !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS6)){
+        if(Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS5)
+                || Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS6)
+                || !Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS5)){
             throw new JeroBootException("收入合同状态不正确！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 07b79bc2..ee4edac8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -307,6 +307,9 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
             throw new JeroBootException("数据权限不足！");
         }
+        if(!Objects.equals(paySpendingContractStatus.getStatus(),PayIncomeContractCommon.STATUS6)){
+            throw new JeroBootException(paySpendingContractStatus.getContractName() + "支出合同不可删除！");
+        }
         paySpendingContractService.removeById(id);
         LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
         updatePaySpendingContractInstallment.eq(PaySpendingContractInstallment::getContractId,id);