Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents fb141b4f 806d25eb
Showing 1 changed file with 9 additions and 3 deletions
src/main/java/com/bsth/service/impl/StationServiceImpl.java
@@ -1216,7 +1216,10 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点名称
 			String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 站点名称
-			String stationNameEn = map.get("stationNameEn").equals("") ? "" : map.get("stationNameEn").toString();
+			String stationNameEn = null;
+			if(map.get("stationNameEn")  != null){
+				stationNameEn = map.get("stationNameEn").equals("") ? "" : map.get("stationNameEn").toString();
+			}
 			// 所在道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
 			// 经纬坐标类型
@@ -1295,8 +1298,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			if (map.get("status") == null || Integer.parseInt(map.get("status").toString()) == 1) {
 				StationRoute resultS = routeRepository.findById(stationRouteId).get();
 				// 站点路由序号
-				String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? null
-						: map.get("stationRouteCode").toString();
+				String stationRouteCodeStr = null;
+				if(map.get("stationRouteCode") != null){
+					stationRouteCodeStr = map.get("stationRouteCode").equals("") ? null : map.get("stationRouteCode").toString();
+				}
+				
 				Integer stationRouteCode = null;
 				if (stationRouteCodeStr != null) {
 					String stationRouteCodeAraay[] = stationRouteCodeStr.split("_");