|
@@ -166,7 +166,7 @@ public class ScanService {
|
|
|
}
|
|
|
}
|
|
|
MsReport msReport1 = msReportMapper.msAddr(opens.get(i).getUserId());
|
|
|
- if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
|
|
|
+ if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
|
|
|
continue;
|
|
|
}
|
|
|
r.setRwId(IdWorker.getId());
|