Commit 65efc647a14e596591c92bfa9ee1cc3b7b363ea9
Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
| @@ -345,8 +345,8 @@ public class ServiceDataInterface { | @@ -345,8 +345,8 @@ public class ServiceDataInterface { | ||
| 345 | for (Map.Entry<String, String> m : BasicData.lineCode2NameMap.entrySet()){ | 345 | for (Map.Entry<String, String> m : BasicData.lineCode2NameMap.entrySet()){ |
| 346 | for (Map<String,String> emer : emergencyList){ | 346 | for (Map<String,String> emer : emergencyList){ |
| 347 | for (Map.Entry<String,String> t : emer.entrySet()){ | 347 | for (Map.Entry<String,String> t : emer.entrySet()){ |
| 348 | - if(m.getKey().equals(t.getKey())){ | ||
| 349 | - emergencyListAll.add(emer); // | 348 | + if (m.getKey().equals(t.getKey())) { |
| 349 | + emergencyListAll.add(emer); | ||
| 350 | Line line = lineRepository.findById(Integer.parseInt(t.getKey())).get(); | 350 | Line line = lineRepository.findById(Integer.parseInt(t.getKey())).get(); |
| 351 | line.setName(t.getValue()); | 351 | line.setName(t.getValue()); |
| 352 | Map<String, Object> status = service.update(line); | 352 | Map<String, Object> status = service.update(line); |