Browse Source

主要列表接口修改

anderx 2 years ago
parent
commit
4abe01da68

+ 8 - 6
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -854,12 +854,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         Pagination<?> page = findPage("ExpenseMainList", "ExpenseMainCount", params, in.getPageNo(), in.getPageSize());
         List<MainExpenseAccount> list = (List<MainExpenseAccount>) page.getList();
-        List<Integer> collect = list.stream().map(MainExpenseAccount::getId).collect(Collectors.toList());
-        List<MainExpenseAccount> mainExpenseAccounts = expenseAccountMapper.selectSonByMainIds(collect);
-        for (MainExpenseAccount e : list) {
-            for (MainExpenseAccount me : mainExpenseAccounts) {
-                if (e.getId().equals(me.getId())){
-                    e.setSonList(me.getSonList());
+        if (!list.isEmpty()){
+            List<Integer> collect = list.stream().map(MainExpenseAccount::getId).collect(Collectors.toList());
+            List<MainExpenseAccount> mainExpenseAccounts = expenseAccountMapper.selectSonByMainIds(collect);
+            for (MainExpenseAccount e : list) {
+                for (MainExpenseAccount me : mainExpenseAccounts) {
+                    if (e.getId().equals(me.getId())){
+                        e.setSonList(me.getSonList());
+                    }
                 }
             }
         }