From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
index 9033b0b..dadf00d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
@@ -145,13 +145,14 @@
if (pageWrap.getModel().getHoliday() != null) {
queryWrapper.lambda().like(Holidays::getHoliday, pageWrap.getModel().getHoliday());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ /* for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
+ }*/
+ queryWrapper.lambda().orderByAsc(Holidays::getHoliday);
return PageData.from(holidaysMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3