|
@@ -1570,7 +1570,7 @@ public class MarkServiceImpl implements MarkService {
|
|
List<MarkLibrary> list = libraryDao.findByMarkerIdAndStatus(marker.getId(),statusSet, query);
|
|
List<MarkLibrary> list = libraryDao.findByMarkerIdAndStatus(marker.getId(),statusSet, query);
|
|
MarkLibrary library = list.isEmpty() ? null : list.get(0);
|
|
MarkLibrary library = list.isEmpty() ? null : list.get(0);
|
|
if (library != null && library.getMarkerTime() != null) {
|
|
if (library != null && library.getMarkerTime() != null) {
|
|
- long lastMarkTime = library.getMarkerTime().getTime();
|
|
|
|
|
|
+ long lastMarkTime = library.getHeaderTime()==null? library.getMarkerTime().getTime(): library.getHeaderTime().getTime();
|
|
if (lastUpdateTime != null && lastUpdateTime > lastMarkTime) {
|
|
if (lastUpdateTime != null && lastUpdateTime > lastMarkTime) {
|
|
return false;
|
|
return false;
|
|
} else {
|
|
} else {
|