From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 c32ed50..1da682a 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
@@ -70,6 +70,20 @@
}
/**
+ * 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
+ */
+ public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
+ List<AirEquipmentNongGengBo> airEquipmentBos;
+ if (SecurityUtils.getClientId() == null) {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+ } else {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+ }
+
+ return airEquipmentBos;
+ }
+
+ /**
* 鍒犻櫎澶ф皵璁惧鏁版嵁
*
* @param Id
--
Gitblit v1.9.3