From 3027a41a03775837ea61f41fa9e1d43a104d7e9d Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 31 Dec 2021 17:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProjectController.java | 8 ++------
 .../resources/templates/admin/project_budget_edit.ftl     | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 35d2574..b4eb2cf 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -287,12 +287,8 @@ public class ProjectController extends BaseController {
         for (int i = 0; i < details.size(); i++) {
             ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class);
             if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) {
-                if ("".equals(detail.getName2())) {
-                    return ResponseMsg.buildFailedMsg("业务项目不允许为空");
-                } else {
-                    detail.setName(detail.getName2());
-                    detail.setIsDiy(1);
-                }
+                detail.setName(detail.getName2());
+                detail.setIsDiy(1);
             } else {
                 if ("1".equals(detail.getName1())) {
                     detail.setName("人工费");
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b54d012..47b52f7 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -512,12 +512,14 @@
                                             <#if costProjectManageDetail.type == 1>
                                             <option value="1" <#if costProjectManageDetail.name == "人工费">selected</#if>>人工费</option>
                                             <option value="2" <#if costProjectManageDetail.name == "总部支撑人力费用">selected</#if>>总部支撑人力费用</option>
+                                            <option value="3" <#if costProjectManageDetail.name == "自定义">selected</#if>>自定义</option>
                                             </#if>
                                             <#if costProjectManageDetail.type == 2>
                                             <option value="4" <#if costProjectManageDetail.name == "人员差旅费">selected</#if>>人员差旅费</option>
                                             <option value="5" <#if costProjectManageDetail.name == "业务费用">selected</#if>>业务费用</option>
                                             <option value="6" <#if costProjectManageDetail.name == "商务及专项验收费用">selected</#if>>商务及专项验收费用</option>
                                             <option value="7" <#if costProjectManageDetail.name == "办公费用">selected</#if>>办公费用</option>
+                                            <option value="8" <#if costProjectManageDetail.name == "自定义">selected</#if>>自定义</option>
                                             </#if>
                                         </select>
                                         <input <#if costProjectManageDetail.isDiy == 1>type="text"<#else>type="hidden"</#if> class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2" value="${costProjectManageDetail.name!}">