From c93bb5d4294928ac7969d0b731509ec27da1a250 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 25 五月 2023 16:22:16 +0800
Subject: [PATCH] 支持自定义字段

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

diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index c21d415..51dcad4 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, Integer.MAX_VALUE, 1, true);
 		if (DataTableEntity.isEmpty(dt)) {
 			return;
 		}
@@ -169,11 +169,13 @@
 			}
 			FieldSetEntity fieldInfo = BaseUtil.getSingleInfoByCache("琛ㄥ瓧娈典俊鎭�", new String[]{tableUuid, fieldName});
 			String label = config.getString(FaceConst.FIELD_PROPERTY_LABEL);
+			String fieldUuid = null;
+			String fieldReference = null;
 			if (!FieldSetEntity.isEmpty(fieldInfo)) {
-				String fieldUuid = fieldInfo.getString(FaceConst.UUID);
-				String fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
-				faceListEntity.addField(fieldName, fieldUuid, label, tableColumn.getColumnWidth(), i, fieldReference);
+				fieldUuid = fieldInfo.getString(FaceConst.UUID);
+				fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
 			}
+			faceListEntity.addField(fieldName, fieldUuid, label, tableColumn.getColumnWidth(), i, fieldReference);
 			tableColumn.setField(fieldName);
 			tableColumn.setTitle(config.getString(FaceConst.FIELD_PROPERTY_LABEL));
 			result.add(tableColumn);

--
Gitblit v1.9.2