From 2f875e0756493b257e03173453356029bcf70117 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 8 Aug 2024 14:09:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/engine/utils/Utils.java | 2 +- .../java/io/dataease/extensions/datasource/dto/CalParam.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index d3f8f5e971..345a2b3aec 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -417,7 +417,7 @@ public class Utils { } public static List getParams(List list) { - if (ObjectUtils.isNotEmpty(list)) return Collections.emptyList(); + if (ObjectUtils.isEmpty(list)) return Collections.emptyList(); List param = new ArrayList<>(); for (DatasetTableFieldDTO dto : list) { if (Objects.equals(dto.getExtField(), ExtFieldConstant.EXT_CALC) && ObjectUtils.isNotEmpty(dto.getParams())) { diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java index b24f585a51..e451bc0b41 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/CalParam.java @@ -1,7 +1,5 @@ package io.dataease.extensions.datasource.dto; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -11,7 +9,6 @@ import java.io.Serializable; */ @Data public class CalParam implements Serializable { - @JsonSerialize(using = ToStringSerializer.class) private String id; private String name; private String value;