Browse Source

feat: 新增对账客户查询数据返回优化

hejq 7 years ago
parent
commit
6a95eb1d70

+ 13 - 11
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -514,16 +514,18 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
     public SPage<Vendor> getCustomerInfo(PageParams params, String keyword, String checkDate, Long fromDate, Long endDate) {
         SPage<Vendor> vendorSPage = searchCustomerInfo(params, keyword);
         final Long enUU = SystemSession.getUser().getEnterprise().getUu();
-        vendorSPage.getContent().stream().filter(customer -> null != customer.getApcheck() && customer.getApcheck() == 1)
-            .forEach(customer -> {
-                Long customerUU = customer.getMyEnUU();
-                // 应收总额
-                List<TradeCount> totalTrades = getDueTrade(enUU, customerUU);
-                customer.setTotalCount(totalTrades);
-                // 本月应收
-                List<TradeCount> thisMonthTrades = getThisMonthTrade(enUU, customerUU, checkDate, fromDate, endDate);
-                customer.setThisMonthCount(thisMonthTrades);
-            });
+        if (!CollectionUtils.isEmpty(vendorSPage.getContent())) {
+            vendorSPage.getContent().stream().filter(customer -> null != customer.getApcheck() && customer.getApcheck() == 1)
+                .forEach(customer -> {
+                    Long customerUU = customer.getMyEnUU();
+                    // 应收总额
+                    List<TradeCount> totalTrades = getDueTrade(enUU, customerUU);
+                    customer.setTotalCount(totalTrades);
+                    // 本月应收
+                    List<TradeCount> thisMonthTrades = getThisMonthTrade(enUU, customerUU, checkDate, fromDate, endDate);
+                    customer.setThisMonthCount(thisMonthTrades);
+                });
+        }
         return vendorSPage;
     }
 
@@ -674,7 +676,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
         List<Sort> sortList = new ArrayList<>();
         SearchFilter filter = userService.distribute();
         if (filter != null && filter.getDistribute() == null) {
-            return null;
+            return new SPage<>();
         }
         if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
             List<Object> list = new ArrayList<>();