From 556596475d1946e33be857cd04924201ed611d86 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 18 Jul 2025 11:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserCertificateController.java | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

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<Map<String,Object>> page = new Page();
         page.setCurrent((int)params.get("current"));