From 7e2175df8ed913a858296d4fde0d268879a91daf Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 11:09:37 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 a26a427..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());
@@ -81,11 +81,12 @@
poleXixunPlayer.setScreenShot(programPro.getScreenShot());
// poleXixunPlayer.setCreatTime(sdf.format(date));
poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
- if (!clientService.findClientId()) {
- poleXixunPlayer.setClientId(clientService.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ poleXixunPlayer.setClientId(clientService.getClientId());
+ }
}
-
-
return this.save(poleXixunPlayer);
}
--
Gitblit v1.9.3