From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

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

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index 1b4e15c..1eeb4e2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -430,7 +430,9 @@
         if (ledProgram.getPages() == null) {
             throw new BusinessException("鑺傜洰鍐呭涓㈠け");
         }
-        if (SecurityUtils.getClientId() != null && !Objects.equals(ledProgram.getClientId(), SecurityUtils.getUserId()) && !Objects.equals(ledProgram.getClientId(), SecurityUtils.getClientId())) {
+        if (SecurityUtils.getClientId() != null
+                && !Objects.equals(ledProgram.getClientId(), SecurityUtils.getUserId())
+                && !Objects.equals(ledProgram.getUserId(), SecurityUtils.getUserId())) {
             throw new BusinessException("璇蜂笉瑕佹搷浣滃叾浠栦汉鐨勮妭鐩�");
         }
         String pages = ledProgram.getPages();

--
Gitblit v1.9.3