From 97e484e01c2b86a94735cdd5f6e7adb53a667151 Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Fri, 19 Nov 2021 09:40:46 +0800
Subject: [PATCH] fix sql error

---
 .../payment/manage/mappers/payment/TransactionMapper.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index fbdb2b505..cede896cc 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -593,9 +593,9 @@
         </if>
         <if test="from!=null">and cd.report_date &gt;= #{from}</if>
         <if test="to!=null">and cd.report_date &lt; #{to}</if>
-        <if test="merge_settle!=null">GROUP BY report_date</if>
-        <if test="merge_settle==null">GROUP BY clear_detail_id</if>
-        order by clearing_id desc
+        <if test="merge_settle!=null">GROUP BY cd.report_date</if>
+        <if test="merge_settle==null">GROUP BY cd.clear_detail_id</if>
+        order by c.clearing_id desc
         </where>
     </select>