From 78f297bfcf2f5c49fa11b8f99c2400241c02a934 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 02 六月 2023 10:19:12 +0800
Subject: [PATCH] 组织机构多类型用户解析

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

diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 5cc1b4d..1f89e1b 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -48,7 +48,7 @@
 		if (DataTableEntity.isEmpty(fieldPropertyDt)) {
 			throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
 		}
-		List<JSONObject> result = FaceUtil.getFaceControlList(fse,fieldPropertyDt);
+		List<JSONObject> result = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
 		Map<String, Object> other = new HashMap<>();
 		other.put("drawingList", result);
 		fse.getSubData().clear();
@@ -72,6 +72,13 @@
 		}
 		List<FieldSetEntity> fieldSetEntityList = new ArrayList<>();
 		for (int i = 0; i < fields.getRows(); i++) {
+			if (fields.getBoolean(i, "event_property")) {
+				DataTableEntity subDataTable = fields.getFieldSetEntity(i).getSubDataTable("event_array");
+				if(DataTableEntity.isEmpty(subDataTable)){
+					continue;
+				}
+				fields.setFieldValue(i, "event_array", BaseUtil.dataTableEntityToJson(subDataTable));
+			}
 			fieldSetEntityList.addAll(controlTraverse(new JSONObject((Map) fields.getFieldSetEntity(i).getValues()), null, i));
 		}
 		fse.removeSubData(FaceConst.FACE_FIELD);

--
Gitblit v1.9.2