From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/Entity/Room.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 609e788..2516c3e 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -504,6 +504,14 @@
                         functions.Add(f);
                     }
                 }
+                foreach(var g in FunctionList.List.groupControls)
+                {
+                    if (g.roomIds.Contains(roomId) && roomId != null)
+                    {
+                        g.deviceId = g.userDeviceGroupControlId;
+                        functions.Add(g);
+                    }
+                }
             }
             return functions;
         }
@@ -568,5 +576,6 @@
             scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid));
         }
     }
-  
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0