From 001ead79e19e94ed4e693106431f122b3412529f Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期三, 04 六月 2025 14:23:55 +0800 Subject: [PATCH] 更新 --- src/main/java/com/product/mobile/core/service/FaceMobileService.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 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..459eed4 100644 --- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java +++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java @@ -182,6 +182,8 @@ FaceFieldEntity uuid = new FaceFieldEntity(); FieldSetEntity f = dte.getFieldSetEntity(j); if ("pk".equals(f.getString("field_type")) +// || "created_by".equals(f.getString("field_name")) +// || "created_utc_datetime".equals(f.getString("field_name")) || "updated_by".equals(f.getString("field_name")) || "updated_utc_datetime".equals(f.getString("field_name")) || "flowsign".equals(f.getString("field_type")) @@ -196,6 +198,12 @@ uuid.setMultiple("1"); } else { uuid.setMultiple("0"); + } + + if ("userids".equals(f.getString("field_type")) || "userid".equals(f.getString("field_type"))) { + uuid.setOrganizationType("5"); + } else if ("orgUuids".equals(f.getString("field_type")) || "orgUuid".equals(f.getString("field_type"))) { + uuid.setOrganizationType("2"); } uuid.setComponentType(""); @@ -233,7 +241,8 @@ if (StringUtils.isEmpty(tableUuid)) { throw new BaseException(MobileCoreCode.SYSTEM_FORM_COUNT); } - FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=2", new Object[]{tableUuid}, true); + String faceType = BaseUtil.ifNull(fse.getString("face_type"), "2"); + FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=?", new Object[]{tableUuid,faceType}, true); faceFse.setTableName(tableName); return getFaceField(faceFse); } @@ -473,6 +482,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