报价历史 空数据异常bug

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -177,35 +177,36 @@ public class InsOrdersController extends BaseController {
                 .list();
 
         List<String> insAreaCompanyIdList = insAreaCompanies.stream().map(InsAreaCompany::getId).collect(Collectors.toList());
-
-        List<InsFeeOrderNew> list = insFeeOrderNewService.lambdaQuery().in(InsFeeOrderNew::getInsOrderNo, insAreaCompanyIdList).list();
-        Map<String, InsFeeOrderNew> insFeeOrderNewMap = list.stream().collect(Collectors.toMap(InsFeeOrderNew::getInsOrderNo, x -> x));
-
-        List<InsAreaCompanyHistoryVo> collect = insAreaCompanies.stream().map(a -> {
-            InsAreaCompanyHistoryVo insAreaCompanyHistoryVo = new InsAreaCompanyHistoryVo();
-            BeanUtils.copyProperties(a, insAreaCompanyHistoryVo);
-            insAreaCompanyHistoryVo.setLicenseno(insOrders.getLicenseno());
-            insAreaCompanyHistoryVo.setUserName(insOrders.getUsername());
-            insAreaCompanyHistoryVo.setUserId(insOrders.getUserid());
-            insAreaCompanyHistoryVo.setQuoteno(insOrders.getQuoteno());
-            InsFeeOrderNew insFeeOrderNew = insFeeOrderNewMap.get(a.getId());
-            if (!ObjectUtils.isEmpty(insFeeOrderNew)){
-                SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
-                insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
-                insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
-                insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
-                insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
-                insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
-                insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
-                insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
-                        .add(subOrderExportFeeVo.getSyExportCosts())
-                        .add(subOrderExportFeeVo.getNoExportCosts()));
-            }
-            // 设置评分信息
-            insAreaCompanyHistoryVo.setRatingInformation();
-            return insAreaCompanyHistoryVo;
-        }).collect(Collectors.toList());
-
+        List<InsAreaCompanyHistoryVo> collect = new ArrayList<>();
+        if(!insAreaCompanyIdList.isEmpty()) {
+            List<InsFeeOrderNew> list = insFeeOrderNewService.lambdaQuery().in(InsFeeOrderNew::getInsOrderNo, insAreaCompanyIdList).list();
+            Map<String, InsFeeOrderNew> insFeeOrderNewMap = list.stream().collect(Collectors.toMap(InsFeeOrderNew::getInsOrderNo, x -> x));
+
+            collect = insAreaCompanies.stream().map(a -> {
+                InsAreaCompanyHistoryVo insAreaCompanyHistoryVo = new InsAreaCompanyHistoryVo();
+                BeanUtils.copyProperties(a, insAreaCompanyHistoryVo);
+                insAreaCompanyHistoryVo.setLicenseno(insOrders.getLicenseno());
+                insAreaCompanyHistoryVo.setUserName(insOrders.getUsername());
+                insAreaCompanyHistoryVo.setUserId(insOrders.getUserid());
+                insAreaCompanyHistoryVo.setQuoteno(insOrders.getQuoteno());
+                InsFeeOrderNew insFeeOrderNew = insFeeOrderNewMap.get(a.getId());
+                if (!ObjectUtils.isEmpty(insFeeOrderNew)) {
+                    SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
+                    insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
+                    insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
+                    insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                    insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
+                    insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
+                    insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
+                    insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                            .add(subOrderExportFeeVo.getSyExportCosts())
+                            .add(subOrderExportFeeVo.getNoExportCosts()));
+                }
+                // 设置评分信息
+                insAreaCompanyHistoryVo.setRatingInformation();
+                return insAreaCompanyHistoryVo;
+            }).collect(Collectors.toList());
+        }
         return HttpResult.ok("success", collect);
     }