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

Merge pull request #4869 from dataease/pr@dev@fixextratdata

Browse Source 
fix: 解析sql 错误
This commit is contained in:
taojinlong 2023-03-23 18:33:25 +08:00 committed by GitHub
commit 17a461ab8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1169,8 +1169,12 @@ public class DataSetTableService {
binaryExpression = (BinaryExpression) expr; binaryExpression = (BinaryExpression) expr;
} catch (Exception e) { } catch (Exception e) {
} }
if (binaryExpression != null && !(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getRightExpression() instanceof BinaryExpression) && hasVariable(binaryExpression.toString())) { if (binaryExpression != null) {
stringBuilder.append(SubstitutedSql); if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
stringBuilder.append(SubstitutedSql);
}else {
expr.accept(getExpressionDeParser(stringBuilder));
}
} else { } else {
expr.accept(getExpressionDeParser(stringBuilder)); expr.accept(getExpressionDeParser(stringBuilder));
} }

8
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -463,14 +463,6 @@
> >
<template #header> <template #header>
{{ $t('commons.params_value') }} {{ $t('commons.params_value') }}
<el-tooltip
class="item"
effect="dark"
:content="$t('commons.parameter_effect')"
placement="top"
>
<svg-icon icon-class="icon_info_filled" />
</el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input