From d72e7d16776d31c2fd29b60929e896bccded3029 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 04 三月 2022 14:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 587667e..aaeb3d5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -38,11 +38,11 @@
@GetMapping("/list")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
+ LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(keyword);
- if (null != keyword) {
+ /* if (null != keyword) {
wrapper.like(IpVolumeFile::getFileName, keyword);
- }
+ }*/
return ResponseUtil.success(ipVolumeFileService.list(wrapper));
}
}
--
Gitblit v1.9.3