From a1df2c22de60f7da447fb9f2be0333f6f60078e4 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 30 Dec 2024 13:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/DetailYMapper.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index 8e1f642..cc207bd 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -45,6 +45,7 @@ public interface DetailYMapper {
                     "`user` ON detail_y.jwcode = `user`.jwcode",
                     "<where>",
                     "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
+                    "<if test='area!=null and area.length>0'>AND `user`.area=#{area}</if>",
                     "</where>",
                     "GROUP BY",
                     "user_gold.jwcode",
@@ -68,7 +69,9 @@ public interface DetailYMapper {
             "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
             "<if test='updateType!=null'>and update_type=#{updateType}</if>",
             "<if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+
             "</where>",
+            "ORDER BY detaily_id desc",
             "</script>"
 
     })
@@ -84,9 +87,9 @@ public interface DetailYMapper {
             "`detail_y`",
             "<where>",
             "<if test='jwcode!=null and jwcode.length>0'>AND jwcode=#{jwcode}</if>",
-//            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
-//            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='area!=null and area.length>0'>AND area=#{area}</if>",
+            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
+            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
+
             "</where>",
             "</script>"
     })