From e3727eaec9fd07327b937811b8053176e8929990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 28 Feb 2022 12:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/ctrl/XmTaskController.java   | 7 +++++++
 .../src/main/java/com/xm/core/service/XmTaskService.java   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index 208e78df..949708ad 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -1126,6 +1126,12 @@ public class XmTaskController {
 					m.put("tips", tips);
 					return m;
 				}
+				if(task.getBudgetCost()==null){
+					task.setBudgetCost(BigDecimal.ZERO);
+				}
+				if(task.getBudgetWorkload()==null){
+					task.setBudgetWorkload(BigDecimal.ZERO);
+				}
 				frontParamsTaskMap.put(task.getId(),task);
 				if(xmTaskDbMap.containsKey(task.getId())){
 					updateTasks.add(task);
@@ -1163,6 +1169,7 @@ public class XmTaskController {
 			if(tasksLvl1.size()>0){
 				BigDecimal totalTaskBudgetCost=BigDecimal.ZERO;
 				for (XmTask task : tasksLvl1) {
+
 					totalTaskBudgetCost=totalTaskBudgetCost.add(task.getBudgetCost());
 				}
 				if(totalTaskBudgetCost.compareTo(BigDecimal.ZERO)>0){
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index 8e2d9157..99247a5c 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -147,8 +147,8 @@ public class XmTaskService extends BaseService {
 			return tips;
 		}
 
-		BigDecimal budgetCost=NumberUtil.getBigDecimal(g.get("budgetCost"));
-		BigDecimal childBudgetCost=NumberUtil.getBigDecimal(g.get("childBudgetCost"));
+		BigDecimal budgetCost=NumberUtil.getBigDecimal(g.get("budgetCost"),BigDecimal.ZERO);
+		BigDecimal childBudgetCost=NumberUtil.getBigDecimal(g.get("childBudgetCost"),BigDecimal.ZERO);
 		if(budgetCost.compareTo(childBudgetCost)<0) {
 			tips.setFailureMsg("任务合计总预算超出上级总预算"+childBudgetCost.subtract(budgetCost)+"元");
 			return tips;