From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/Room.cs | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 1fdebfd..2606c6c 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -504,6 +504,13 @@
functions.Add(f);
}
}
+ foreach(var g in FunctionList.List.groupControls)
+ {
+ if (g.roomIds.Contains(roomId) && roomId != null)
+ {
+ functions.Add(g);
+ }
+ }
}
return functions;
}
--
Gitblit v1.8.0