Commit 56b41adaea509cb82fd862ada61212380b3a8cef
1 parent
877412e9
update
Showing
3 changed files
with
10 additions
and
4 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
| @@ -247,8 +247,10 @@ public class DayOfSchedule implements CommandLineRunner { | @@ -247,8 +247,10 @@ public class DayOfSchedule implements CommandLineRunner { | ||
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | for(ScheduleRealInfo sch : remList){ | 249 | for(ScheduleRealInfo sch : remList){ |
| 250 | - nbbmScheduleMap.remove(sch.getClZbh(), sch); | ||
| 251 | - count ++; | 250 | + if(null != sch){ |
| 251 | + nbbmScheduleMap.remove(sch.getClZbh(), sch); | ||
| 252 | + count ++; | ||
| 253 | + } | ||
| 252 | } | 254 | } |
| 253 | 255 | ||
| 254 | logger.info(lineCode + "排班清理 " + count); | 256 | logger.info(lineCode + "排班清理 " + count); |
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
| @@ -541,7 +541,11 @@ public class ScheduleRealInfo { | @@ -541,7 +541,11 @@ public class ScheduleRealInfo { | ||
| 541 | 541 | ||
| 542 | @Override | 542 | @Override |
| 543 | public boolean equals(Object obj) { | 543 | public boolean equals(Object obj) { |
| 544 | - return this.id.equals(((ScheduleRealInfo)obj).getId()); | 544 | + try{ |
| 545 | + return this.id.equals(((ScheduleRealInfo)obj).getId()); | ||
| 546 | + }catch(Exception e){ | ||
| 547 | + return false; | ||
| 548 | + } | ||
| 545 | } | 549 | } |
| 546 | 550 | ||
| 547 | public String getQdzArrDateJH() { | 551 | public String getQdzArrDateJH() { |