From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index f93ff6c..3144977 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -135,6 +135,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name)
{
+
List<Entity.Room> roomList = new List<Entity.Room>();
Entity.Room room1 = new Entity.Room();
room1.roomName = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
@@ -143,14 +144,9 @@
var roomLists = GetGatewayRoomList();
foreach (var room in roomLists)
{
- var devlist = GetRoomDevice(room);
- if (devlist.Count == 0)
- {
- //杩囨护鎺夋病鏈夎澶囩殑鎴块棿;
- continue;
- }
roomList.Add(room);
}
+
return roomList;
}
/// <summary>
--
Gitblit v1.8.0