许鹏程
2024-11-18 09131ff8e95978711d7956b40484c4a03320b7b1
src/main/java/com/product/face/service/FaceDesignService.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONObject;
import com.product.admin.service.PublicService;
import com.product.common.lang.StringUtils;
import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.CoreConst;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -51,6 +52,16 @@
      List<JSONObject> result = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
      Map<String, Object> other = new HashMap<>();
      other.put("drawingList", result);
      DataTableEntity faceCustomField = fse.getSubDataTable("product_sys_face_custom_field");
      if (!DataTableEntity.isEmpty(faceCustomField)) {
         for (int i = 0; i < faceCustomField.getRows(); i++) {
            faceCustomField.setFieldValue(i, "customField", true);
            faceCustomField.setFieldValue(i, "added", true);
         }
         other.put("product_sys_face_custom_field", BaseUtil.dataTableEntityToJson(faceCustomField));
      } else {
         other.put("product_sys_face_custom_field", new String[]{});
      }
      fse.getSubData().clear();
      return BaseUtil.success(fse, other);
   }
@@ -74,7 +85,7 @@
      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)){
            if (DataTableEntity.isEmpty(subDataTable)) {
               continue;
            }
            fields.setFieldValue(i, "event_array", BaseUtil.dataTableEntityToJson(subDataTable));