From 220aadc8c089c55f508a28302c14730d39fa2139 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 14:13:59 +0800
Subject: [PATCH] pp
---
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
index 7926562..29f8cc1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
@@ -152,7 +152,7 @@
queryWrapper.lambda().eq(FileRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(FileRecord::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(FileRecord::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getInfo() != null) {
queryWrapper.lambda().eq(FileRecord::getInfo, pageWrap.getModel().getInfo());
@@ -164,18 +164,25 @@
queryWrapper.lambda().eq(FileRecord::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getFolder() != null) {
- queryWrapper.lambda().eq(FileRecord::getFolder, pageWrap.getModel().getFolder());
+ queryWrapper.lambda().like(FileRecord::getFolder, pageWrap.getModel().getFolder());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(FileRecord::getStatus, pageWrap.getModel().getStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (pageWrap.getModel().getKeyval() != null) {
+ queryWrapper.lambda().like(FileRecord::getKeyval, pageWrap.getModel().getKeyval());
+ }
+ if (pageWrap.getModel().getUrl() != null) {
+ queryWrapper.lambda().like(FileRecord::getUrl, pageWrap.getModel().getUrl());
+ }
+ /* for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
+ }*/
+ queryWrapper.lambda().orderByAsc(FileRecord::getStatus);
return PageData.from(fileRecordMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3