1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -446,11 +446,17 @@ public class BiInfoController {
         .orderBy("create_date",false));
         List<TranCarInfo> tranCarInfoList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(tranCarInfos)) {
-            for (int i = 0; i < 30; i++) {
+            for (int i = 0; i < tranCarInfos.size(); i++) {
 
                 TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranCarInfos.get(i).getInfoId());
                 tranCarInfos.get(i).setTranTaskInfos(tranTaskInfo);
-                tranCarInfoList.add(tranCarInfos.get(i));
+                if(StringUtils.isNotBlank(tranTaskInfo.getStartArea())){
+
+                    tranCarInfoList.add(tranCarInfos.get(i));
+                }
+                if(tranCarInfoList.size()>30){
+                    break;
+                }
 
             }
             biViewInfo.setTranCarInfos(tranCarInfoList);