From 84afb0cebcd698f0c1fdb95f02231dc99e9252a9 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期六, 15 三月 2025 13:49:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-project-server-contract into dev
---
src/main/java/com/product/contract/service/ProjectBusinessService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index 16966ef..8c5efcc 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.product.common.lang.StringUtils;
import com.product.contract.config.CmnConst;
import com.product.contract.service.ide.IProjectBusinessService;
import com.product.core.dao.BaseDao;
@@ -66,6 +67,9 @@
JSONObject json = new JSONObject();
for (int i = 0; i < projectType.getRows(); i++) {
FieldSetEntity fs = projectType.getFieldSetEntity(i);
+ if (!StringUtils.isEmpty(fse.getString("type")) &&fse.getString("type").equals("view")){
+ fs.remove("uuid");
+ }
if (json.getJSONArray(fs.getString("project_task"))==null){
JSONArray objects = new JSONArray();
objects.add(BaseUtil.fieldSetEntityToJson(fs));
@@ -107,6 +111,9 @@
@Transactional
@Override
public boolean saveProject(FieldSetEntity fse) {
+ if (!StringUtils.isEmpty(fse.getString("del")) &&fse.getString("del").equals("2")){
+ baseDao.delete(CmnConst.PRODUCT_PROJECT_BUSINESS_PLAN,"project_uuid=?",new String[]{fse.getUUID()});
+ }
return baseDao.saveFieldSetEntity(BaseUtil.createCreatorAndCreationTime(fse));
}
}
--
Gitblit v1.9.2