From bc68f4393cafe39c4fce614c8128936067ea25f7 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 17:18:17 +0800
Subject: [PATCH] bug：登录问题和操作日志
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
index f02a264..990e9d4 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
@@ -116,10 +116,8 @@
storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
break;
}
-
}
}
-
listVo.add(storeConfigVo);
}
@@ -136,20 +134,18 @@
storeConfigVo.setSort(worldCupStore.getSort());
listVo.add(storeConfigVo);
}
-
-
//排序
Collections.sort(listVo, new Comparator<StoreConfigVo>() {
@Override
public int compare(StoreConfigVo o1, StoreConfigVo o2) {
- return o1.getSort().compareTo(o2.getSort());
+ return Comparator.nullsLast(Integer::compareTo).compare(o1.getSort(), o2.getSort());
}
});
//排序
Collections.sort(listVo, new Comparator<StoreConfigVo>() {
@Override
public int compare(StoreConfigVo o1, StoreConfigVo o2) {
- return o1.getIsTop().compareTo(o2.getIsTop()) * -1;
+ return Comparator.nullsLast(Integer::compareTo).compare(o2.getIsTop(), o1.getIsTop());
}
});
for (int i = 0; i < listVo.size(); i++) {
--
Gitblit v1.7.1