From 6560d896800c83a4d69de786052f4c07583ac01b Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期日, 20 十一月 2022 21:00:26 +0800
Subject: [PATCH] 临时文件不处理站点信息
---
src/main/java/com/whyc/service/ExcelExportService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 7a7f752..f2d784c 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -73,10 +73,12 @@
info.setChainResGoodCount(chainResGoodCount);
StationInfo stationInfo = info.getStationInfo();
- if(stationInfo.getStationName2().equals("-")){
- stationInfo.setStationName(stationInfo.getStationName1());
- }else{
- stationInfo.setStationName(stationInfo.getStationName1()+"-"+stationInfo.getStationName2());
+ if(stationInfo!=null) {
+ if (stationInfo.getStationName2().equals("-")) {
+ stationInfo.setStationName(stationInfo.getStationName1());
+ } else {
+ stationInfo.setStationName(stationInfo.getStationName1() + "-" + stationInfo.getStationName2());
+ }
}
map.put("dto", info);
//鍥剧墖
--
Gitblit v1.9.1