update

潘钊
1 parent 877412e9
Showing 3 changed files with 10 additions and 4 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/resources/application.properties
@@ -247,8 +247,10 @@ public class DayOfSchedule implements CommandLineRunner {
 		}
  
 		for(ScheduleRealInfo sch : remList){
-			nbbmScheduleMap.remove(sch.getClZbh(), sch);
-			count ++;
+			if(null != sch){
+				nbbmScheduleMap.remove(sch.getClZbh(), sch);
+				count ++;
+			}
 		}
  
 		logger.info(lineCode + "排班清理 " + count);
@@ -541,7 +541,11 @@ public class ScheduleRealInfo {
  
 	@Override
 	public boolean equals(Object obj) {
-		return this.id.equals(((ScheduleRealInfo)obj).getId());
+		try{
+			return this.id.equals(((ScheduleRealInfo)obj).getId());
+		}catch(Exception e){
+			return false;
+		}
 	}
  
 	public String getQdzArrDateJH() {
 spring.profiles: dev,prod
-spring.profiles.active: dev
+spring.profiles.active: prod
  
 spring.view.suffix=.html
 server.session-timeout=-1