|
@@ -95,22 +95,26 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
|
|
|
* publishTaskInfo.getPageSize());
|
|
|
//自定义装货区
|
|
|
- String loading = publishTaskInfo.getLoadingPlace();
|
|
|
- boolean loadingt = loading.contains(",");
|
|
|
- if(loadingt){
|
|
|
- List<String> loadingList = Arrays.asList(loading.split(","));
|
|
|
- pageView.put("loadingList", loadingList);
|
|
|
- }else {
|
|
|
- pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
|
|
|
+ if(!StringUtils.isEmpty(publishTaskInfo.getLoadingPlace())){
|
|
|
+ String loading = publishTaskInfo.getLoadingPlace();
|
|
|
+ boolean loadingt = loading.contains(",");
|
|
|
+ if(loadingt){
|
|
|
+ List<String> loadingList = Arrays.asList(loading.split(","));
|
|
|
+ pageView.put("loadingList", loadingList);
|
|
|
+ }else {
|
|
|
+ pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
|
|
|
+ }
|
|
|
}
|
|
|
//自定义卸货区
|
|
|
- String unloading = publishTaskInfo.getUnLoadingPlace();
|
|
|
- boolean unloadingt = unloading.contains(",");
|
|
|
- if(unloadingt){
|
|
|
- List<String> unloadingList = Arrays.asList(unloading.split(","));
|
|
|
- pageView.put("unloadingList", unloadingList);
|
|
|
- }else {
|
|
|
- pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
|
|
|
+ if(!StringUtils.isEmpty(publishTaskInfo.getUnLoadingPlace())){
|
|
|
+ String unloading = publishTaskInfo.getUnLoadingPlace();
|
|
|
+ boolean unloadingt = unloading.contains(",");
|
|
|
+ if(unloadingt){
|
|
|
+ List<String> unloadingList = Arrays.asList(unloading.split(","));
|
|
|
+ pageView.put("unloadingList", unloadingList);
|
|
|
+ }else {
|
|
|
+ pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
|
|
|
+ }
|
|
|
}
|
|
|
//用户id
|
|
|
pageView.put("loadingPlaceCity", publishTaskInfo.getLoadingPlaceCity());
|