From 33ac37190b3f1e718326d39d33cf7c05ff3e3a20 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 28 七月 2023 14:46:40 +0800
Subject: [PATCH] 保存时默认为电脑端
---
src/main/java/com/product/face/service/FaceDesignService.java | 12 +++++++++++-
1 files changed, 11 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..200fe1d 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);
@@ -82,6 +89,9 @@
if (!StringUtils.isEmpty(fse.getUUID())) {
getBaseDao().delete(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY, "master_uuid=?", new Object[]{fse.getUUID()});
}
+ if (StringUtils.isEmpty(fse.getString("terminal_type"))) {
+ fse.setValue("terminal_type", 1);
+ }
getBaseDao().saveFieldSetEntity(fse);
fse.getSubData().clear();
return fse;
--
Gitblit v1.9.2