From c88f44a7d604bf91e22a5cb076018884a01a6261 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期六, 19 十一月 2022 15:11:17 +0800
Subject: [PATCH] 替换阿里oss为本地minio,关闭对时存在定时任务时睡眠10min

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java |    9 +--------
 1 files changed, 1 insertions(+), 8 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 2a1b83f..44e8bb1 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
@@ -75,14 +75,8 @@
             airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
         }
 
-        if (SecurityUtils.getClientId() == null) {
-            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
-        } else {
-            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
-        }
 
-        return null;
-//        return airEquipmentBos;
+        return airEquipmentBos;
     }
 
     /**
@@ -97,7 +91,6 @@
         }
 
         return airEquipmentBos;
-//        return null;
     }
 
     /**

--
Gitblit v1.9.3