Explorar o código

财务报销 功能优化

zhaoxian %!s(int64=2) %!d(string=hai) anos
pai
achega
3b2279ad70

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/reimburse/mondule/mapper/xml/ReimburseApplyMapper.xml

@@ -26,7 +26,7 @@
             AND stat_date >=#{startDate}
             AND stat_date <=#{endDate}
         </if>
-        union
+        union all
         SELECT *, 2 as 'flag' FROM ctop_reimburse_apply
         where 1=1
         <if test="financialReview == 1">
@@ -52,7 +52,7 @@
             AND stat_date >=#{startDate}
             AND stat_date &lt;=#{endDate}
         </if>
-        union
+        union all
         SELECT t1.*, 3 as 'flag' FROM ctop_reimburse_apply t1
         left join ctop_reimburse_apply_leader_rel t2 on t1.id = t2.apply_id
         where