许鹏程
2023-06-02 78f297bfcf2f5c49fa11b8f99c2400241c02a934
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);