wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-15 18:45:20 +08:00
parent 64d7563cb2 8574f26607
commit e93234e7ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -510,7 +510,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (pinTop > 0) { if (pinTop > 0) {
return index.getPinTopTime() == null ? new Date(0).getTime() + (index.getTotal() == null ? 0L : index.getTotal()) : index.getPinTopTime().getTime() + +(index.getTotal() == null ? 0L : 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 { } else {
return new Date(0).getTime() + index.getTotal(); return new Date(0).getTime() + (index.getTotal() == null ? 0L : index.getTotal());
} }
}).reversed() }).reversed()
).collect(Collectors.toList())); ).collect(Collectors.toList()));
@ -521,7 +521,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (pinTop > 0) { if (pinTop > 0) {
return index.getPinTopTime() == null ? new Date(0).getTime() + (index.getTotal() == null ? 0L : index.getTotal()) : index.getPinTopTime().getTime() + (index.getTotal() == null ? 0L : 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 { } else {
return new Date(0).getTime() + index.getTotal(); return new Date(0).getTime() + (index.getTotal() == null ? 0L : index.getTotal());
} }
}) })
).collect(Collectors.toList())); ).collect(Collectors.toList()));