|
|
@@ -311,8 +311,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
|
public Object logList(Integer eaid) {
|
|
|
List<OutExpenseAccountLog> list = expenseAccountLogMapper.selectByEaid(eaid);
|
|
|
- int maxProcessStatus=list.get(list.size()-1).getProcessStatus();
|
|
|
-
|
|
|
+ OutExpenseAccountLog lastout=list.get(list.size()-1);
|
|
|
+ int maxProcessStatus=0;
|
|
|
+ if (lastout.getStatus()!=3)maxProcessStatus=lastout.getProcessStatus();
|
|
|
List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
|
list.addAll(eaelist);
|
|
|
return list;
|