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 16:11:20 +08:00
parent 37251fa0d8 5b63e648e2
commit 1198ca9a09
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,6 +478,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}, Comparator.reverseOrder()) }, Comparator.reverseOrder())
.thenComparing(x -> { .thenComparing(x -> {
Map index = (Map) x; Map index = (Map) x;
int pingTOp_ = (index.get("pin_top") == null) ? 0 : Integer.parseInt(index.get("pin_top").toString());
if (pingTOp_ <= 0) {
return 0l;
}
long pingTOp = (index.get("pin_top_time") == null) ? 0 : Long.parseLong(index.get("pin_top_time").toString()); long pingTOp = (index.get("pin_top_time") == null) ? 0 : Long.parseLong(index.get("pin_top_time").toString());
return pingTOp; return pingTOp;
}, Comparator.reverseOrder()) }, Comparator.reverseOrder())
@ -500,6 +504,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}, Comparator.reverseOrder()) }, Comparator.reverseOrder())
.thenComparing(x -> { .thenComparing(x -> {
Map index = (Map) x; Map index = (Map) x;
int pingTOp_ = (index.get("pin_top") == null) ? 0 : Integer.parseInt(index.get("pin_top").toString());
if (pingTOp_ <= 0) {
return 0l;
}
long pingTOp = (index.get("pin_top_time") == null) ? 0 : Long.parseLong(index.get("pin_top_time").toString()); long pingTOp = (index.get("pin_top_time") == null) ? 0 : Long.parseLong(index.get("pin_top_time").toString());
return pingTOp; return pingTOp;
}, Comparator.reverseOrder()) }, Comparator.reverseOrder())