防范线路数据缺失造成的营运非营运线路查询出现的空指针报错

娄高锋
1 parent 2615acf1
Showing 3 changed files with 12 additions and 12 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
@@ -755,11 +755,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			for (int i = 0; i < listAll.size(); i++) {
 				CalcStatistics c=listAll.get(i);
 				if(nature.equals("1")){
-					if(lineMap.get(c.getXl())){
+					if(lineMap.containsKey(c.getXl()) && lineMap.get(c.getXl())){
 						list.add(c);
 					}
 				}else{
-					if(!lineMap.get(c.getXl())){
+					if(lineMap.containsKey(c.getXl()) && !lineMap.get(c.getXl())){
 						list.add(c);
 					}
 				}
@@ -2845,11 +2845,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if (nature.equals("0")) {
 				list.add(s);
 			}else if(nature.equals("1")){
-				if(lineMap.get(s.getXlBm())){
+				if(lineMap.containsKey(s.getXlBm()) && lineMap.get(s.getXlBm())){
 					list.add(s);
 				}
 			}else{
-				if(!lineMap.get(s.getXlBm())){
+				if(lineMap.containsKey(s.getXlBm()) && !lineMap.get(s.getXlBm())){
 					list.add(s);
 				}
 			}
@@ -3040,11 +3040,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if (nature.equals("0")) {
 				list.add(s);
 			}else if(nature.equals("1")){
-				if(lineMap.get(s.getXlBm())){
+				if(lineMap.containsKey(s.getXlBm()) && lineMap.get(s.getXlBm())){
 					list.add(s);
 				}
 			}else{
-				if(!lineMap.get(s.getXlBm())){
+				if(lineMap.containsKey(s.getXlBm()) && !lineMap.get(s.getXlBm())){
 					list.add(s);
 				}
 			}
@@ -115,11 +115,11 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 			if (nature.equals("0")) {
 				list.add(lists.get(i));
 			}else if(nature.equals("1")){
-				if(lineMap.get(lists.get(i).getXl())){
+				if(lineMap.containsKey(lists.get(i).getXl()) && lineMap.get(lists.get(i).getXl())){
 					list.add(lists.get(i));
 				}
 			}else{
-				if(!lineMap.get(lists.get(i).getXl())){
+				if(lineMap.containsKey(lists.get(i).getXl()) && !lineMap.get(lists.get(i).getXl())){
 					list.add(lists.get(i));
 				}
 			}
@@ -866,7 +866,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 					xlMap.put(m.get("xl").toString(), m.get("xl").toString());
 				}
 			}else if(nature.equals("1")){
-				if(lineMap.get(m.get("xl").toString())){
+				if(lineMap.containsKey(m.get("xl").toString()) && lineMap.get(m.get("xl").toString())){
 					list.add(m);
 					jhcc += Integer.valueOf(m.get("jhcc").toString());
 					sjcc += Integer.valueOf(m.get("sjcc").toString());
@@ -878,7 +878,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 					}
 				}
 			}else{
-				if(!lineMap.get(m.get("xl").toString())){
+				if(lineMap.containsKey(m.get("xl").toString()) && !lineMap.get(m.get("xl").toString())){
 					list.add(m);
 					jhcc += Integer.valueOf(m.get("jhcc").toString());
 					sjcc += Integer.valueOf(m.get("sjcc").toString());
@@ -1026,7 +1026,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 					xlMap.put(m.get("xl").toString(), m.get("xl").toString());
 				}
 			}else if(nature.equals("1")){
-				if(lineMap.get(m.get("xl").toString())){
+				if(lineMap.containsKey(m.get("xl").toString()) && lineMap.get(m.get("xl").toString())){
 					list.add(m);
 					jhcc += Integer.valueOf(m.get("jhcc").toString());
 					sjcc += Integer.valueOf(m.get("sjcc").toString());
@@ -1040,7 +1040,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 					}
 				}
 			}else{
-				if(!lineMap.get(m.get("xl").toString())){
+				if(lineMap.containsKey(m.get("xl").toString()) && !lineMap.get(m.get("xl").toString())){
 					list.add(m);
 					jhcc += Integer.valueOf(m.get("jhcc").toString());
 					sjcc += Integer.valueOf(m.get("sjcc").toString());