Commit 50f6d09e authored by 雍欢's avatar 雍欢

自定义查询SQL方言

parent a1fd855b
......@@ -3,6 +3,7 @@ package com.huigou.data.query.model;
import com.huigou.data.query.XMLParseUtil;
import com.huigou.exception.NotFoundException;
import com.huigou.uasp.bmp.query.QueryDocument.Query;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.Collections;
......@@ -46,7 +47,9 @@ public class QueryDescriptor {
public Query getQuery() {
// 优先从方言xml中取
return queries.stream().findFirst().get();
return queries.stream()
.filter(query -> StringUtils.isNotBlank(query.getSqlQuery()))
.findFirst().get();
}
public void setQuery(Query query) {
......
......@@ -28,7 +28,6 @@
<activiti.version>5.21.0</activiti.version>
<asm.version>5.0.4</asm.version>
<aspectj.version>1.9.2</aspectj.version>
<c3p0.version>0.9.5.2</c3p0.version>
<commons-chain.version>1.2</commons-chain.version>
<commons.version>1.8</commons.version>
<commons-digester.version>2.0</commons-digester.version>
......@@ -1057,17 +1056,6 @@
</exclusions>
</dependency>
<!-- c3p0 -->
<!-- <dependency> <groupId>c3p0</groupId> <artifactId>c3p0</artifactId>
<version>${c3p0.version}</version> <exclusions> <exclusion> <groupId>*</groupId>
<artifactId>*</artifactId> </exclusion> </exclusions> </dependency> -->
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>${c3p0.version}</version>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-chain</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment