center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4363 from dataease/pr@dev@fix_panel-select-error

Browse Source 
fix(仪表板): 修复模板状态的仪表板下拉组件编辑可能报错问题
This commit is contained in:
王嘉豪 2023-01-12 12:28:14 +08:00 committed by GitHub
commit d76933d6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -972,7 +972,11 @@ public class DataSetTableService {
return new ArrayList<>(); return new ArrayList<>();
} }
DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(id); 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<SqlVariableDetails> getSqlVariableDetails(String type, List<DatasetTable> datasetTables) { private List<SqlVariableDetails> getSqlVariableDetails(String type, List<DatasetTable> datasetTables) {
@ -2861,7 +2865,8 @@ public class DataSetTableService {
hasSubBinaryExpression = false; hasSubBinaryExpression = false;
try { try {
BinaryExpression rightBinaryExpression = (BinaryExpression) expr.getRightExpression(); BinaryExpression rightBinaryExpression = (BinaryExpression) expr.getRightExpression();
hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression;; hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression;
;
} catch (Exception e) { } catch (Exception e) {
} }
if (expr.getRightExpression() instanceof BinaryExpression && !hasSubBinaryExpression && hasVariable(expr.getRightExpression().toString())) { if (expr.getRightExpression() instanceof BinaryExpression && !hasSubBinaryExpression && hasVariable(expr.getRightExpression().toString())) {