From d332a7c8c27afa9ef90607e57a6a3dfd6dae3a00 Mon Sep 17 00:00:00 2001
From: cheng <1821349743@qq.com>
Date: 星期三, 26 二月 2025 22:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index bb0f105..1543023 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -473,6 +473,19 @@
 						faceFieldEntity.setAllowDelete(setEntity.getBoolean("property_value"));
 					} else if ("control_sequence".equals(propertyName)) {
 						faceFieldEntity.putOtherParam("controlSequence", setEntity.getInteger("property_value"));
+					} else if ("__config__".equals(propertyName)) {
+
+						String __config__ = setEntity.getUUID();
+						List<FieldSetEntity> fieldSetEntities2 = parentMap.get(__config__);
+						if (!CollectionUtil.isEmpty(fieldSetEntities2)) {
+							for (FieldSetEntity fieldSetEntity4 : fieldSetEntities2) {
+								if ("label".equals(fieldSetEntity4.getString("property_name"))) {
+									faceFieldEntity.setName(fieldSetEntity4.getString("property_value"));
+								} else if ("required".equals(fieldSetEntity4.getString("property_name"))) {
+									faceFieldEntity.setRequired(fieldSetEntity4.getBoolean("property_value") ? "1" : "0");
+								}
+							}
+						}
 					}
 				}
 				List<FaceFieldEntity> subFieldList = faceFieldEntity.getSubField();

--
Gitblit v1.9.2