From eb4eb5ec588462e45f7dea235c578ac4fe346aa7 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 19 四月 2022 10:09:42 +0800
Subject: [PATCH] 菜单排序

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

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index e827f30..cde80d1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -45,14 +45,14 @@
     //鐔欒鑺傜洰鍒楄〃
     public LambdaQueryWrapper<PoleXixunPlayerEntity> XixunPlayerList(String keyword) {
         if (SecurityUtils.getClientId() == null) {
-            if (keyword.isEmpty()) {
+            if (keyword != null && keyword.isEmpty()) {
                 return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class);
             } else {
                 return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).like(PoleXixunPlayerEntity::getProgramName, keyword);
             }
 
         } else {
-            if (keyword.isEmpty()) {
+            if (keyword != null && keyword.isEmpty()) {
                 return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).eq(PoleXixunPlayerEntity::getCreateUserId, SecurityUtils.getUserId())
                         .or(w -> {
                             w.eq(PoleXixunPlayerEntity::getClientId, SecurityUtils.getClientId());

--
Gitblit v1.9.3