diff --git a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java index 5354a3be..bbc98186 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java @@ -104,7 +104,43 @@ public class UserCertificateController { } } resList = resList.stream().sorted((map1,map2)->{ - return Long.compare(((List)map2.get("certificate")).size(),((List)map1.get("certificate")).size()); + int a = Long.compare(((List)map2.get("certificate")).size(),((List)map1.get("certificate")).size()); + if (a==0){ + if (Integer.parseInt(map2.get("msg").toString().split(",")[0].split(":")[1])> + Integer.parseInt(map1.get("msg").toString().split(",")[0].split(":")[1])){ + return 1; + }else if (Integer.parseInt(map2.get("msg").toString().split(",")[0].split(":")[1])== + Integer.parseInt(map1.get("msg").toString().split(",")[0].split(":")[1])){ + if (Integer.parseInt(map2.get("msg").toString().split(",")[1].split(":")[1])> + Integer.parseInt(map1.get("msg").toString().split(",")[1].split(":")[1])){ + return 1; + }else if (Integer.parseInt(map2.get("msg").toString().split(",")[1].split(":")[1])== + Integer.parseInt(map1.get("msg").toString().split(",")[1].split(":")[1])){ + if (Integer.parseInt(map2.get("msg").toString().split(",")[2].split(":")[1])> + Integer.parseInt(map1.get("msg").toString().split(",")[2].split(":")[1])){ + return 1; + }else if (Integer.parseInt(map2.get("msg").toString().split(",")[2].split(":")[1])== + Integer.parseInt(map1.get("msg").toString().split(",")[2].split(":")[1])){ + if (Integer.parseInt(map2.get("msg").toString().split(",")[3].split(":")[1])> + Integer.parseInt(map1.get("msg").toString().split(",")[3].split(":")[1])){ + return 1; + }else if (Integer.parseInt(map2.get("msg").toString().split(",")[3].split(":")[1])== + Integer.parseInt(map1.get("msg").toString().split(",")[3].split(":")[1])){ + return 0; + }else { + return -1; + } + }else { + return -1; + } + }else { + return -1; + } + }else { + return -1; + } + } + return a; }).collect(Collectors.toList()); Page> page = new Page(); page.setCurrent((int)params.get("current"));