Merge branch 'master' into docker_package

2022-10-14 11:15:12 +08:00 · 2022-10-14 11:15:12 +08:00 · f80c31fc21
parent 19db902082 27b34d26c2
commit f80c31fc21
1 changed files with 4 additions and 1 deletions
--- 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',