From 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:06:42 +0800
Subject: [PATCH] IP音柱任务列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index 1554e7b..a4d1aed 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -65,7 +65,6 @@
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
- Long clientId = SecurityUtils.getClientId();
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
if (2 == broadcastTerminalV2Param.getWorkState()) {
@@ -78,9 +77,19 @@
if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState);
+ }
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
+ , null, broadcastTerminalV2Param.getBindingState());
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
+ , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ }
}
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -185,6 +194,7 @@
/**
* 鏍规嵁缁堢id鑾峰彇缁堢淇℃伅
+ *
* @param name
* @param id
* @return
--
Gitblit v1.9.3