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

王通
2 parents 55f82339 76240a6e
Showing 2 changed files with 2 additions and 3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/statisticsDaily.html
@@ -3255,11 +3255,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);
 				}
 			}
@@ -330,7 +330,6 @@
 					$get('/realSchedule/statisticsDailyTj',params,function(result){
  
 						$.each(result, function(i, e){
-							console.log(e);
 							if(e && e.startDate && e.startDate <= '2025-09-20'){
 								e.zt = 0; // 要求从更新后开始的数据才标红。
 							}