From cffa7b139b568990ef465f6756168d8fc1f7decd Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 12 Jan 2023 12:23:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A8=A1=E6=9D=BF=E7=8A=B6=E6=80=81=E7=9A=84=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8F=AF=E8=83=BD=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index c7244f0ed6..d91485d152 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -972,7 +972,11 @@ public class DataSetTableService { return new ArrayList<>(); } DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(id); - return getSqlVariableDetails(type, Arrays.asList(datasetTable)); + if (datasetTable != null) { + return getSqlVariableDetails(type, Arrays.asList(datasetTable)); + } else { + return null; + } } private List getSqlVariableDetails(String type, List datasetTables) { @@ -2861,7 +2865,8 @@ public class DataSetTableService { hasSubBinaryExpression = false; try { BinaryExpression rightBinaryExpression = (BinaryExpression) expr.getRightExpression(); - hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression;; + hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression; + ; } catch (Exception e) { } if (expr.getRightExpression() instanceof BinaryExpression && !hasSubBinaryExpression && hasVariable(expr.getRightExpression().toString())) {