From d3d362d09c0af07a8b67cdaec9a12f465df9116b Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 22 May 2025 17:10:46 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=9C=8B=E6=9D=BF=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/board/BoardMapper.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
index d2ffc622..f0095b82 100644
--- a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
+++ b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
@@ -163,7 +163,7 @@
 
     <!-- 各币种充值数据 -->
     <select id="listAccountRechargeBoard" resultType="com.hzs.system.board.vo.BoardRechargeAccountVO">
-        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 0 sort
+        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 0 sort, ba.field_value
         from (select t.pk_account, sum(t.recharge_amount) recharge_amount
               from CU_MEMBER_RECHARGE t
               where t.del_flag = 0
@@ -185,7 +185,7 @@
                                 and ba.del_flag = 0
         where ba.field_value in (1, 2, 3, 4)
         union all
-        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 1 sort
+        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 1 sort, ba.field_value
         from (select t.pk_account, sum(t.recharge_amount) recharge_amount
               from CU_MEMBER_RECHARGE t
               where t.del_flag = 0
@@ -207,7 +207,7 @@
                                 and ba.del_flag = 0
         where ba.field_value in (1, 2, 3, 4)
         union all
-        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 2 sort
+        select ba.account_name, nvl(a.recharge_amount, 0) recharge_amount, 2 sort, ba.field_value
         from (select t.pk_account, sum(t.recharge_amount) recharge_amount
               from CU_MEMBER_RECHARGE t
               where t.del_flag = 0
@@ -228,6 +228,7 @@
                             on ba.pk_id = a.pk_account
                                 and ba.del_flag = 0
         where ba.field_value in (1, 2, 3, 4)
+        order by sort, field_value
     </select>
 
 </mapper>