From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml
index 835617b..208dfe0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml
@@ -155,8 +155,8 @@
     <select id="queryDiscountInfo" resultType="map">
         select
         aa.time,
-        aa.`name`,
-        aa.phone,
+        ANY_VALUE(aa.`name`) as name,
+        ANY_VALUE(aa.phone) as phone,
         sum(aa.discountMoney) as discountMoney
         from (
             select
@@ -225,7 +225,7 @@
             <if test="null != companyId">
                 and a.companyId = #{companyId}
             </if>
-        ) as aa group by aa.time, userId order by aa.time desc
+        ) as aa group by aa.time, aa.userId order by aa.time desc
         <if test="null != offset and null != limit">
             limit #{offset}, #{limit}
         </if>
@@ -304,7 +304,6 @@
                 and a.companyId = #{companyId}
             </if>
             ) as aa group by aa.time, userId
-
         ) as w
     </select>
 </mapper>

--
Gitblit v1.7.1