Merge remote-tracking branch 'origin/master' into 4.2.0

Author: zhou-hao

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/builder/fragments/query/QueryTermsFragmentBuilder.java

@@ -1,5 +1,6 @@
 package org.hswebframework.ezorm.rdb.operator.builder.fragments.query;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.metadata.TableOrViewMetadata;
@@ -12,6 +13,7 @@
 import org.hswebframework.ezorm.rdb.operator.dml.Join;
 import org.hswebframework.ezorm.rdb.operator.dml.query.QueryOperatorParameter;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SelectColumn;
+import org.hswebframework.ezorm.rdb.utils.FlatList;
 
 import java.util.*;
 
@@ -97,10 +99,13 @@ protected SqlFragments createTermFragments(QueryOperatorParameter parameter, Ter
         if (column != null) {
             return createByColumn(column, parameter.getFromAlias(), term);
         }
-        String cname = columnName;
 
+        List<SelectColumn> cols = parameter.getSelect();
+        if (CollectionUtils.isNotEmpty(parameter.getAlias())) {
+            cols = new FlatList<>(Arrays.asList(cols, parameter.getAlias()));
+        }
         //匹配查询的列别名
-        for (SelectColumn selectColumn : parameter.getSelect()) {
+        for (SelectColumn selectColumn : cols) {
             if (Objects.equals(selectColumn.getAlias(), columnName)) {
                 String selectColumnName = selectColumn.getColumn();
                 //join
@@ -113,6 +118,7 @@ protected SqlFragments createTermFragments(QueryOperatorParameter parameter, Ter
                 }
             }
         }
+        String cname = columnName;
 
         //匹配join
         for (Join join : parameter.getJoins()) {

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/operator/dml/query/QueryOperatorParameter.java

@@ -14,6 +14,13 @@ public class QueryOperatorParameter {
 
     private List<SelectColumn> select = new ArrayList<>();
 
+    /**
+     * 别名,用于标识可使用的条件别名对应的列信息.
+     *
+     * @since 4.1.4
+     */
+    private List<SelectColumn> alias = new ArrayList<>();
+
     private Set<String> selectExcludes = new HashSet<>();
 
     private String from;
@@ -38,12 +45,16 @@ public class QueryOperatorParameter {
 
     private Map<String, Object> context;
 
+    public QueryOperatorParameter() {
+    }
+
     public Optional<Join> findJoin(String targetName) {
-        return Optional.ofNullable(joins)
-                       .flatMap(_joins -> _joins
-                               .stream()
-                               .filter(join -> join.equalsTargetOrAlias(targetName))
-                               .findFirst());
+        return Optional
+            .ofNullable(joins)
+            .flatMap(_joins -> _joins
+                .stream()
+                .filter(join -> join.equalsTargetOrAlias(targetName))
+                .findFirst());
     }
 
     public String getFromAlias() {
@@ -57,12 +68,13 @@ public String getFromAlias() {
     @Override
     @SuppressWarnings("all")
     @SneakyThrows
-    public QueryOperatorParameter clone(){
+    public QueryOperatorParameter clone() {
         QueryOperatorParameter parameter = new QueryOperatorParameter();
         parameter.select.addAll(this.select);
         parameter.selectExcludes.addAll(this.selectExcludes);
         parameter.from = this.from;
         parameter.fromAlias = this.fromAlias;
+        parameter.alias.addAll(this.alias);
         parameter.where.addAll(this.where);
         parameter.joins.addAll(this.joins);
         parameter.orderBy.addAll(this.orderBy);