From 09131ff8e95978711d7956b40484c4a03320b7b1 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 18 十一月 2024 16:24:43 +0800
Subject: [PATCH] 多子表字段

---
 src/main/java/com/product/face/service/FaceCacheService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 5b0b933..eb8989a 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -54,7 +54,7 @@
 		if (!StringUtils.isEmpty(uuid)) {
 			objects = new Object[]{uuid};
 		}
-		DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, Integer.MAX_VALUE, 1, true);
+		DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, 0, 0, true);
 		if (DataTableEntity.isEmpty(dt)) {
 			return;
 		}
@@ -148,11 +148,21 @@
 		}
 		String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
 		String tableUuid = fse.getString(FaceConst.FIELD_TABLE_UUID);
+		String treeShow = fse.getString("tree_show");
+		String treeDataType = fse.getString("tree_data_type");
+		String treeDataSource = fse.getString("tree_datasource");
+		String treeLabelKey = fse.getString("tree_label_key");
+		String treeValueKey = fse.getString("tree_value_key");
 		List<TableColumn> result = Lists.newArrayList();
 		FaceListEntity faceListEntity = new FaceListEntity();
 		faceListEntity.setFaceName(faceNumber);
 		faceListEntity.setTableUuid(tableUuid);
 		faceListEntity.setUuid(fse.getUUID());
+		faceListEntity.setTreeShow(treeShow);
+		faceListEntity.setTreeDataType(treeDataType);
+		faceListEntity.setTreeDataSource(treeDataSource);
+		faceListEntity.setTreeLabelKey(treeLabelKey);
+		faceListEntity.setTreeValueKey(treeValueKey);
 		for (int i = 0; i < tableColumns.size(); i++) {
 			TableColumn tableColumn = new TableColumn();
 			JSONObject columnJson = tableColumns.getJSONObject(i);

--
Gitblit v1.9.2