anderx 2 роки тому
батько
коміт
bc74a0b6a1

+ 9 - 7
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -439,14 +439,16 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             OutExpenseAccountLog lastout = list.get(list.size() - 1);
             ExpenseAccount expenseAccount = expenseAccountMapper.selectByPrimaryKey(eaid);
             Integer processStatus = expenseAccount.getProcessStatus();
-            if (processStatus <4){
-                List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, processStatus);
-                list.addAll(outExpenseAccountLogs);
-                processStatus=3;
-            }
-            if (lastout.getStatus() != 3) {
-                addDetailsLog(list, expenseAccount,processStatus);
+            if (processStatus<8){
+                if (processStatus <4){
+                    List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, processStatus);
+                    list.addAll(outExpenseAccountLogs);
+                    processStatus=3;
+                }
+                if (lastout.getStatus() != 3) {
+                    addDetailsLog(list, expenseAccount,processStatus);
 
+                }
             }
         }
             return list;