修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -735,6 +735,14 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         Map<String, Object> pageView = new HashMap<>(16);
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
+        Page<PublishTaskInfo> page = new Page<>();
+        if (publishTaskInfo.getLoadingPlace() == null || publishTaskInfo.getLoadingPlaceCity() == null) {
+            page.setRecords(Lists.newArrayList());
+            page.setTotal(0);
+            page.setCurrent(publishTaskInfo.getCurrentPage());
+            page.setSize(publishTaskInfo.getPageSize());
+            return page;
+        }
         //自定义装货区
         if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlace())) {
             String loading = publishTaskInfo.getLoadingPlace();
@@ -1070,7 +1078,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                }
 //            }
         }
-        Page<PublishTaskInfo> page = new Page<>();
+
         page.setRecords(publishTaskInfoList == null ? Lists.newArrayList() : publishTaskInfoList);
         page.setTotal(publishTaskInfoList.size() == 0 ? 0 : publishTaskInfoList.size());
         page.setCurrent(publishTaskInfo.getCurrentPage());