Sfoglia il codice sorgente

修改报销财务审核人

anderx 2 anni fa
parent
commit
aab57c4675

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

@@ -945,7 +945,7 @@
     left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
     left join department dep on mea.apply_dep =dep.id
     left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on a.aid=ad.id
-    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
+    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id=ad2.id
     where 1=1
    <include refid="ExpenseDetailsSql"/>
     ${page_sql}

+ 1 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -133,6 +133,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 eae.setAuditor(dep.getExpenseFinanceId());
                 eae.setAuditorname(dep.getExpenseFinanceName());
             }else if (i==4){
+                if (dep.getExpenseRetrialFinanceId()==null)throw new BusinessException("报销部门财务复审人不存在。");
                 eae.setAuditor(dep.getExpenseRetrialFinanceId());
                 eae.setAuditorname(dep.getExpenseRetrialFinanceName());
             }else if (i==6){