From 724c79463fc7c4f345fc2dd508aeab139b57afa5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 14:14:54 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index f8672af..9c98ae6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -21,6 +21,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,9 +57,15 @@
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
List<String> list;
if (SecurityUtils.getClientId() == null) {
- list = monitorMapper.listMonitorDeviceSerial(null);
+ list = monitorMapper.listMonitorDeviceSerial(null, monitorParam.getKeyword());
} else {
- list = monitorMapper.listMonitorDeviceSerial(SecurityUtils.getUserId());
+ list = monitorMapper.listMonitorDeviceSerial(SecurityUtils.getUserId(), monitorParam.getKeyword());
+ }
+
+ //娌℃湁鏁版嵁鏃跺�欑洿鎺ヨ繑鍥炵┖鏁扮粍
+ if (list.size() == 0 || list == null) {
+ List<MonitorBo> nullList = new ArrayList<>();
+ return nullList;
}
MonitorParam monitorParam1;
@@ -69,8 +76,6 @@
getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
}
-
- Long clientId = SecurityUtils.getClientId();
if (baseConditionVO != null) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
@@ -85,7 +90,7 @@
monitorParam.setEquipmentState(2);
}
- monitorList = monitorMapper.listMonitorByIds(list, monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
+ monitorList = monitorMapper.listMonitorByIds(list, monitorParam.getBindingState(), monitorParam.getEquipmentState());
return monitorList;
}
--
Gitblit v1.9.3