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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 611867a..aa3c90f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -146,7 +146,7 @@
if (updateId == null) {
queryWrapper.eq("project_name", entity.getProjectName());
-
+ queryWrapper.eq("deleted",0);
if (StringUtils.isNotEmpty(entity.getProjectCode())) {
queryWrapper.eq("project_code", entity.getProjectCode());
}
@@ -191,6 +191,10 @@
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
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())){
@@ -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