From e35967bbb7a3a678752283c64fe2a496e2f3b702 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 23:37:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr-2.1
---
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