oa二期内容更新

ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml

@@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findFinanceByTime" resultMap="SysOaFinanceResult">
         <include refid="selectFinanceVo" />
         where a.finance_type = #{financeType}
+        <if test="  payType!=NULL and payType!=null and  payType !='0' ">
+            and a.pay_type = #{payType}
+        </if>
         and a.project_id = 0
         and date_format(a.finance_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
         and date_format(a.finance_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')