From 4999af7326b571e936fbbbab017f6a64f87ba5ad Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 10:15:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index 94c9996..eb243c1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -46,7 +46,7 @@
         }
 
         LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
-        if (!keyword.isEmpty()) {
+        if (keyword != null&&!keyword.isEmpty()) {
             wrapper.like(LEDProgramFile::getName, keyword);
         }
 

--
Gitblit v1.9.3