Commit d331f9e55c652c11fa30ee872e52204e5a766447

Authored by 王通
2 parents 74c04e65 d061df93

Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8

src/main/java/com/bsth/repository/StationRouteRepository.java
@@ -229,12 +229,13 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int @@ -229,12 +229,13 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int
229 "a.station_route_code," + 229 "a.station_route_code," +
230 "b.station_cod," + 230 "b.station_cod," +
231 "a.distances,"+ 231 "a.distances,"+
232 - "s.station_name," + 232 + "a.station_name," +
233 "a.directions FROM (SELECT " + 233 "a.directions FROM (SELECT " +
234 "s.station_mark," + 234 "s.station_mark," +
235 "s.station_route_code," + 235 "s.station_route_code," +
236 "s.directions," + 236 "s.directions," +
237 "s.distances,"+ 237 "s.distances,"+
  238 + "s.station_name,"+
238 "s.station FROM bsth_c_stationroute s where s.line = ?1 and s.destroy=0) a " + 239 "s.station FROM bsth_c_stationroute s where s.line = ?1 and s.destroy=0) a " +
239 "LEFT JOIN bsth_c_station b " + 240 "LEFT JOIN bsth_c_station b " +
240 " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true) 241 " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)