From 4e13d9ca7b8c9d1010f213fa5d50c182f31dabf6 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 28 Oct 2024 15:48:34 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A8:=201:=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/ProjectBudgetService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 47781ff..7994279 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -699,7 +699,9 @@ public class ProjectBudgetService {
                 deviceCost=deviceCost.add(budgetPlan.getDeviceCost());
                 projectManageCost = projectManageCost.add(budgetPlan.getProjectManageCost());
                 earnestMoneyCost = earnestMoneyCost.add(budgetPlan.getEarnestMoneyCost());
-                engineerCost = engineerCost.add(budgetPlan.getEngineerCost());
+                if (budgetPlan.getEngineerCost()!=null) {
+                    engineerCost = engineerCost.add(budgetPlan.getEngineerCost());
+                }
                 BigDecimal projectCostTemp = projectPayments.getOrDefault("工程成本", BigDecimal.ZERO);
                 budgetPlan.setProjectCost(projectCostTemp);
                 projectCost = projectCost.add(projectCostTemp);