Explorar o código

报销列表BUG修复

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
775713e7b9

+ 2 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -457,16 +457,17 @@
       where c.`type` = #{type})x on a.id=x.id
     </if>
     left join admin d on a.aid =d.id left join department f on d.department_id =f.id
-    left join admin d2 on f.finance_id =d2.id
     <if test="expenseMain ==0">
       left join expense_relationship er on a.id=er.ea_id
       left join expense_account mea on  er.id=mea.id
       left join t_order_new e on mea.order_no =e.order_no
       left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
+      left join admin d2 on b.expense_finance_id =d2.id
     </if>
     <if test="expenseMain ==1">
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
       left join t_order_new e on a.order_no =e.order_no
+      left join admin d2 on b.expense_finance_id =d2.id
     </if>
     left join t_order_mid  tm on e.order_no =tm.order_no
     <if test="processStatus ==1">