npe
This commit is contained in:
parent
d7b4075e7f
commit
d79578665f
|
@ -508,7 +508,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
ResourceDTO index = (ResourceDTO) x;
|
||||
int pinTop = index.getPinTop() == null ? 0 : index.getPinTop();
|
||||
if (pinTop > 0) {
|
||||
return index.getPinTopTime() == null ? new Date(0).getTime() + index.getTotal() : index.getPinTopTime().getTime() + index.getTotal();
|
||||
return index.getPinTopTime() == null ? new Date(0).getTime() + (index.getTotal() == null ? 0L : index.getTotal()) : index.getPinTopTime().getTime() + +(index.getTotal() == null ? 0L : index.getTotal());
|
||||
} else {
|
||||
return new Date(0).getTime() + index.getTotal();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue