From 0bb6071f92b2d26ae23c225bf4db8593a328a22f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 四月 2025 13:48:57 +0800
Subject: [PATCH] 项目草稿bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 9f8f43a..9b1bdb3 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -832,6 +832,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
+ // 鑽夌鐨勬儏鍐碉紝闇�瑕佸垽瀹氭湁娌℃湁閫変笟涓诲崟浣�(鍥犱负鑽夌涓嶆牎楠屽繀濉�)锛屾病閫夊垯榛樿璁剧疆涓哄綋鍓嶄汉鐨勫崟浣�
+ if (ProjectConstant.DRAFT.equals(form.getProjectInfoForm().getUsedStatus())) {
+ if (Objects.isNull(form.getProjectInfoForm().getProjectOwnerUnit())) {
+ form.getProjectInfoForm().setProjectOwnerUnit(SecurityUtils.getDeptId());
+ }
+ }
Long projectId = form.getProjectInfoForm().getId();
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
@@ -840,12 +846,12 @@
Long userId = SecurityUtils.getUserId();
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
- //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍革紙鑽夌闄ゅ锛�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
- // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
- if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃(绠＄悊鍛樹繚瀛樹负鑽夌锛岄偅涔堢姸鎬佽繕鏄崏绋�)
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,null)){
@@ -885,12 +891,12 @@
ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), entity);
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
- //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍革紙鑽夌闄ゅ锛�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
- // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
- if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃(绠＄悊鍛樹繚瀛樹负鑽夌锛岄偅涔堢姸鎬佽繕鏄崏绋�)
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity, entity.getId())){
--
Gitblit v1.8.0