From 8f3be92933e13712ffaf6831375f100fc155dcce Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 18:42:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083252=20=E5=A4=96=E7=BD=91=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=A4=8D=E5=88=B6=E4=BC=9A=E5=91=98=E6=8A=A5=E8=AF=B7?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9C=89=E6=95=88=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/member/service/ITbMemberProjectSubitemService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index a3e34c06..00a6d0c1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -811,7 +811,11 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 		if (ProjectCommon.MEMBER_NATURE1.equals(memberNature)) {
 			amountReceivable = memberProject.getCouncilChargeStandard();
 		}else {
-			amountReceivable = memberProject.getCouncilChargeStandard();
+			amountReceivable = memberProject.getChargeStandard();
+		}
+		//如果两种都没有金额
+		if (amountReceivable == null){
+			amountReceivable = memberProjectSubitem.getAmountReceivable();
 		}
 		tbMemberProjectSubitem.setAmountReceivable(amountReceivable);
 		BigDecimal taxRate = memberProjectSubitem.getTaxRate();