From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index b831f9b..c81b710 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -125,7 +125,7 @@
* @param seq
* @return
*/
- public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq, Long groupId) {
//鎺掑簭瀛楁
String orderByResult = OrderByEnums.VNNOX_ID.getCode();
//姝ｅ簭銆佸�掑彊
@@ -163,9 +163,9 @@
List<LedPlayerEntity> list;
//瓒呯
if (SecurityUtils.getClientId() == null) {
- list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, null);
+ list = ledPlayerEntityMapper.ledListByGroupId(keyword, null, groupId);
} else {
- list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, SecurityUtils.getUserId());
+ list = ledPlayerEntityMapper.ledListByGroupId(keyword, SecurityUtils.getUserId(), groupId);
}
return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
}
--
Gitblit v1.9.3