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:37:23 +08:00
parent b0e7330961 6a9ae0e939
commit 64d7563cb2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,11 +474,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
.sorted(Comparator.comparing(x -> { .sorted(Comparator.comparing(x -> {
Map index = (Map) x; Map index = (Map) x;
int pingTOp_ = (index.get("pin_top") == null) ? 0 : Integer.parseInt(index.get("pin_top").toString()); int pingTOp_ = (index.get("pin_top") == null) ? 0 : Integer.parseInt(index.get("pin_top").toString());
String string = (index.get("total") == null) ? "0" : index.get("total").toString(); String total = (index.get("total") == null) ? "0" : index.get("total").toString();
if (pingTOp_ <= 0) { if (pingTOp_ <= 0) {
return 0l + Long.valueOf(string); return 0l + Long.valueOf(total);
} }
long pingTOp = (index.get("pin_top_time") == null) ? 0 + Long.valueOf(string) : Long.parseLong(index.get("pin_top_time").toString()) + Long.valueOf(string); long pingTOp = (index.get("pin_top_time") == null) ? 0 + Long.valueOf(total) : Long.parseLong(index.get("pin_top_time").toString()) + Long.valueOf(total);
return pingTOp; return pingTOp;
}).reversed() }).reversed()
).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(x -> Long.valueOf(x.get("id").toString())).limit(pageSize).collect(Collectors.toList()); ).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(x -> Long.valueOf(x.get("id").toString())).limit(pageSize).collect(Collectors.toList());