From 74523031c8558b78898cf3bb7b754d8ad0e3d4eb Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Thu, 13 Oct 2022 23:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=8Csql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/resource/ResourceDao.xml       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 8d93cb2c..5462c9cb 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1924,7 +1924,10 @@
         <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
-        UNION
+
+
+        UNION ALL
+
         SELECT
         tmb.dept AS 'deptName',
         tm.`name` AS 'resourceName',