From bcf076c98e4a0e06cf883df90057826930c31a2d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 26 四月 2022 17:34:29 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index a1b421a..bc087e1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -471,15 +471,15 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public CommonPage<String> listDeviceCode(int pageNo, int pageSize) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
List<String> list;
if (SecurityUtils.getClientId() != null) {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(SecurityUtils.getUserId());
+ list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
} else {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(null);
+ list = baseMapper.listCode(null, keyword, deviceCode);
}
return CommonPage.restPage(list);
--
Gitblit v1.9.3