From ac070bd08ba4cb6c1e3bf670db75b6a8e801b84b Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 17 十一月 2025 18:00:30 +0800
Subject: [PATCH] 表单建模树优化

---
 src/main/java/com/product/face/service/FaceDesignService.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 9daf37d..3480f04 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -17,6 +17,7 @@
 import com.product.face.config.FaceConst;
 import com.product.face.service.ide.IFaceDesignService;
 import com.product.face.util.FaceUtil;
+import com.product.file.config.CmnConst;
 import com.product.util.BaseUtil;
 import org.apache.poi.hdgf.pointers.Pointer;
 import org.apache.poi.ss.formula.functions.T;
@@ -37,6 +38,14 @@
 	@Resource
 	public PublicService publicService;
 
+	public DataTableEntity listAllTable(){
+		return getBaseDao().listTable("product_sys_datamodel_table", null, "table_type ASC");
+	}
+	
+	public DataTableEntity listAllDesignFace(){
+		return getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG);
+	}
+	
 	/**
 	 * 鑾峰彇琛ㄥ崟閰嶇疆璇︽儏
 	 *
@@ -147,6 +156,10 @@
 					FieldSetEntity fs = getTemplateFieldSet(entry.getKey(), entry.getValue(), groupUuid);
 					if (fs != null) {
 						int propertyType = fs.getInteger(FaceConst.FIELD_PROPERTY_TYPE).intValue();
+						// 2025骞�6鏈�16鏃� 14:28:39 绉诲姩绔� 浜哄憳閫夋嫨瀛楁鏈�夛紝榛樿涓�0 bug瑙e喅锛堟湰韬槸false锛屼絾鏄暟鎹簱淇濆瓨涓�0锛�
+						if (5 == propertyType && "defaultValue".equals(fs.getString("property_name")) && !fs.getBoolean("property_value")) {
+							continue;
+						}
 						if ((4 == propertyType || 3 == propertyType) && (entry.getValue() instanceof JSONArray || entry.getValue() instanceof JSONObject)) {
 							try {
 								fieldSetList.addAll(controlTraverse(entry.getValue(), fs.getUUID(), null, pointer));

--
Gitblit v1.9.2