From df6de51727c20a6c4a09f665c0ea84bb889296ad Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Fri, 7 Jan 2022 10:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#46731,#46866?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/PayWorkingGroupServiceImpl.java  | 2 +-
 .../service/impl/PayWorkingGroupSubItemServiceImpl.java   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 7904d01a..8ddf41b6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -315,7 +315,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
                 p.setCreateTime(null);
                 p.setUpdateBy(null);
                 p.setUpdateTime(null);
-                if(p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
                     p.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
                 }else{
                     p.setPaymentStatus(null);
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 ee319f4c..4b2b0d80 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
@@ -180,7 +180,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             log.info("工作组成员-添加异常",e);
             throw new JeroBootException("工作组成员单位已存在！");
         }
-
+        if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+            payWorkingGroupSubItem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
+        }
         setPayWorkingGroupSubItemAdd(payWorkingGroupSubItem);
         payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
         payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0);
@@ -264,7 +266,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 }
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
-                if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
                     paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
                 }
                 paySendContactsMessageDTO.setJson(json);
@@ -286,7 +288,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 }
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
-                if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
                     paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
                 }
                 paySendContactsMessageDTO.setJson(json);