潘钊 / bsth_control · Commits

Commit a8eecb3fb5096c02032f6c79acdf150a828dbce7

Authored by 娄高锋
2 parents fb141b4f 806d25eb

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

Inline Side-by-side
Showing 1 changed file with 9 additions and 3 deletions
src/main/java/com/bsth/service/impl/StationServiceImpl.java
  View file @a8eecb3
... ... @@ -1216,7 +1216,10 @@ public class StationServiceImpl extends BaseServiceImpl<Station, Integer> implem
1216 1216 // 站点名称
1217 1217 String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
1218 1218 // 站点名称
1219   - String stationNameEn = map.get("stationNameEn").equals("") ? "" : map.get("stationNameEn").toString();
  1219 + String stationNameEn = null;
  1220 + if(map.get("stationNameEn") != null){
  1221 + stationNameEn = map.get("stationNameEn").equals("") ? "" : map.get("stationNameEn").toString();
  1222 + }
1220 1223 // 所在道路编码
1221 1224 String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
1222 1225 // 经纬坐标类型
... ... @@ -1295,8 +1298,11 @@ public class StationServiceImpl extends BaseServiceImpl<Station, Integer> implem
1295 1298 if (map.get("status") == null || Integer.parseInt(map.get("status").toString()) == 1) {
1296 1299 StationRoute resultS = routeRepository.findById(stationRouteId).get();
1297 1300 // 站点路由序号
1298   - String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? null
1299   - : map.get("stationRouteCode").toString();
  1301 + String stationRouteCodeStr = null;
  1302 + if(map.get("stationRouteCode") != null){
  1303 + stationRouteCodeStr = map.get("stationRouteCode").equals("") ? null : map.get("stationRouteCode").toString();
  1304 + }
  1305 +
1300 1306 Integer stationRouteCode = null;
1301 1307 if (stationRouteCodeStr != null) {
1302 1308 String stationRouteCodeAraay[] = stationRouteCodeStr.split("_");
... ...