From f590cd46b46d36610a3ed29591865de77d3e92ae Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期一, 21 十一月 2022 08:15:29 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
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