Commit 90cd03ea57caecf89b5fd0b3b7d1999f5f975a4c

Authored by 娄高锋
1 parent 08bab103

审计公里汇总表查询营运线路返回全部线路的问题。

src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -2496,12 +2496,13 @@ public class ReportServiceImpl implements ReportService{ @@ -2496,12 +2496,13 @@ public class ReportServiceImpl implements ReportService{
2496 }else{ 2496 }else{
2497 for (Map<String, Object> m : listAll) { 2497 for (Map<String, Object> m : listAll) {
2498 if(m.get("xl") != null && m.get("xl").toString().trim().length() > 0){ 2498 if(m.get("xl") != null && m.get("xl").toString().trim().length() > 0){
  2499 + String xl = m.get("xl").toString();
2499 if(nature.equals("1")){ 2500 if(nature.equals("1")){
2500 - if(lineMap.containsKey(m.get("xl").toString())){ 2501 + if(lineMap.containsKey(xl) && lineMap.get(xl)){
2501 list.add(m); 2502 list.add(m);
2502 } 2503 }
2503 }else{ 2504 }else{
2504 - if(!lineMap.containsKey(m.get("xl").toString())){ 2505 + if(!(lineMap.containsKey(xl) && lineMap.get(xl))){
2505 list.add(m); 2506 list.add(m);
2506 } 2507 }
2507 } 2508 }