From 3d34f39838f12fa69f088b229e91dfe3febe4185 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 10 十月 2022 11:27:29 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index d361a03..6b8f1bc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -6,7 +6,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
-import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
@@ -61,27 +60,29 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
List<AirEquipmentNongGengBo> airEquipmentBos;
- if (SecurityUtils.getClientId() == null) {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
- } else {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
- }
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+// }
- return airEquipmentBos;
+ return null;
+// return airEquipmentBos;
}
/**
* 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
*/
public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
- List<AirEquipmentNongGengBo> airEquipmentBos;
- if (SecurityUtils.getClientId() == null) {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
- } else {
- airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
- }
+// List<AirEquipmentNongGengBo> airEquipmentBos;
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+// }
- return airEquipmentBos;
+// return airEquipmentBos;
+ return null;
}
/**
--
Gitblit v1.9.3