From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index fe7b15f..aa3c90f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -193,6 +193,10 @@
         if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
             entity.setUsedStatus(ProjectConstant.PASS);
         }
+        // 绠$悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            entity.setUsedStatus(ProjectConstant.PASS);
+        }
         if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
             throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
@@ -807,7 +811,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editProject(ProjectForm form) {
-        Long projectId = null;
+        Long projectId = form.getProjectInfoForm().getId();
         if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
             if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
                 //鏂板

--
Gitblit v1.8.0