From e62ebf1c4cce6eb9b09cd3da51928e4a19efdb40 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 11 Nov 2024 18:08:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-140237=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=9B=BF=E6=8D=A2=E3=80=91=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E7=9A=84=E5=88=97=E7=9A=84=E6=9B=BF=E6=8D=A2=E6=B2=A1=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../replace/action/content/tabledata/TableDataFormulaUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaUtils.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaUtils.java index d51dc60064..85c5b54980 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaUtils.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaUtils.java @@ -224,7 +224,7 @@ public class TableDataFormulaUtils { String field = entity.getTargetField(name); // 如果是需要匹配的字段 // 要走到字段匹配，就必须先经过数据集名匹配，目前所有公式都是数据集在前，字段在后 - if (StringUtils.isNotEmpty(field) && StringUtils.equals(parent.toString(), name)) { + if (StringUtils.isNotEmpty(field) && StringUtils.isNotEmpty(parent.toString())) { // 替换成匹配后的字段 Reflect.on(stringLiteral).set(STATEMENT, field); break; From 5a4f3b837aaa2f8ac82f4096246d6f38cb7df9ce Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 11 Nov 2024 18:19:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-140231=20=E3=80=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=9B=BF=E6=8D=A2=E3=80=91=E6=9B=BF=E6=8D=A2=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E4=BB=B6-=E4=BA=8B=E4=BB=B6-=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0-=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0-=E5=AF=BC=E5=87=BA=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8F=82=E6=95=B0=E5=85=AC=E5=BC=8F=E6=9C=AA?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/content/tabledata/TableDataFormulaType.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaType.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaType.java index 283d4df8a2..af1ba2a661 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaType.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/tabledata/TableDataFormulaType.java @@ -41,7 +41,11 @@ public enum TableDataFormulaType { /** * ds1.group(xxx) */ - GROUP("GROUP", 0); + GROUP("GROUP", 0), + /** + * ds1.find(xxx) + */ + FIND("FIND", 0); private int argumentIndex; private String name;