From 0d615c5a9afd0c3dc2afd17d38040f5055d544cb Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 7 Apr 2026 14:05:20 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E7=8E=87=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 988ea0e8e..aea91a9a1 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -1321,10 +1321,7 @@
         group by
         <choose>
             <when test="params.statisticsType != null and params.statisticsType == 1">
-                ifnull(tbSB.salesSupport,'')
-            </when>
-            <when test="params.statisticsType != null and params.statisticsType == 2">
-                tbMA.salesmen
+                tbMA.salesmen,ifnull(tbSB.salesSupport,'')
             </when>
             <otherwise>
                 tbMA.salesmen