From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index d982abd..607aa49 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -83,7 +83,7 @@
});
}
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}
return wrapper;
--
Gitblit v1.9.3