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/PlayPlanNvController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index 14351f3..45ad5aa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -73,7 +73,7 @@
                 w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
             });
         }
-        if (!keyword.isEmpty()) {
+        if (keyword != null && !keyword.isEmpty()) {
             wrapper = wrapper.like(PlayPlanNv::getName, keyword);
         }
         List<PlayPlanNv> list = playPlanNvService.list(wrapper);

--
Gitblit v1.9.3