From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
index fa3a3e6..698b04b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
@@ -161,6 +161,8 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ // 榛樿鎺掑簭锛氭帓搴忕爜鍊掑簭銆佷富閿『搴�
+ queryWrapper.lambda().orderByDesc(Banner::getSortnum).orderByAsc(Banner::getId);
PageData<Banner> result = PageData.from(bannerMapper.selectPage(page, queryWrapper));
if (result != null && result.getRecords() != null) {
String path = getBannerPath();
@@ -228,7 +230,7 @@
}
private String getBannerPath() {
- return systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BANNER_FILES).getCode();
+ return systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BANNER_FILES).getCode();
}
}
--
Gitblit v1.9.3