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 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index 148fc7e..8c5efcc 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -67,7 +67,9 @@
 		JSONObject json = new JSONObject();
 		for (int i = 0; i < projectType.getRows(); i++) {
 			FieldSetEntity fs = projectType.getFieldSetEntity(i);
-			fs.remove("uuid");
+			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));

--
Gitblit v1.9.2