From b594b046cbd23e6f3a48a9f2242c3fe09f3daecf Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 9 Oct 2020 22:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=96=E5=88=92=E6=8F=90?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/custom/SysCommisionMapper.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
index 0bdbc5998..f8b076595 100644
--- a/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
+++ b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
@@ -70,6 +70,12 @@
                 <property name="beginTime" value="#{beginTime}"/>
                 <property name="endTime" value="#{endTime}"/>
             </include>
+            UNION
+            <include refid="groupAmountVo">
+                <property name="column" value="planner_id"/>
+                <property name="beginTime" value="#{beginTime}"/>
+                <property name="endTime" value="#{endTime}"/>
+            </include>
         ) AS a USING(user_id)
         <where>
             <if test="postId != null and postId != ''">and post_id = #{postId}</if>