3.18优化查询筛选多地区条件

pom.xml

@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
-<!--	<version>0.0.3-SNAPSHOT</version>-->
+<!--	<version>0.0.2-SNAPSHOT</version>-->
+	<version>0.0.3-SNAPSHOT</version>
 	<name>demo</name>
 	<description>demo</description>
 

src/main/java/com/example/demo/domain/vo/DetailYgold.java

@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 @NoArgsConstructor
 public class DetailYgold {
@@ -25,4 +27,5 @@ public class DetailYgold {
 
     private String sortField;
     private String sortOrder;
+    private List<String> areas;
 }

src/main/resources/application.yml

@@ -31,6 +31,7 @@ spring:
       cache-null-values: true
   data:
     redis:
+      database: 2
       host: 54.251.137.151
       port: 10703
       password: 8912h12jhhajsd

src/main/resources/mapper/ConsumeMapper.xml

@@ -64,7 +64,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>

src/main/resources/mapper/DetailYMapper.xml

@@ -53,7 +53,7 @@
     </where>
     <choose>
         <!-- 优先使用前端传入的排序参数 -->
-        <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+        <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
             ORDER BY ${sortField} ${sortOrder}
         </when>
         <!-- 默认排序 -->
@@ -112,7 +112,7 @@
         </where>
         <choose>
             <!-- 优先使用前端传入的排序参数 -->
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <!-- 默认排序 -->
@@ -211,7 +211,7 @@
         GROUP BY
         user_gold.jwcode
         <choose>
-            <when test='sortField != null or sortOrder != null'>
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>

src/main/resources/mapper/RechargeMapper.xml

@@ -115,7 +115,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>

src/main/resources/mapper/RefundMapper.xml

@@ -97,7 +97,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>