From dbf79099f47d5f06223edfd5b8dc06c51b1830aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:39 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 0b17f56..d497c19 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -47,15 +47,15 @@
}
}
function.roomIds.Clear();
- foreach (var room in Entity.DB_ResidenceData.residenceData.Rooms)
+ foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
{
if (btnChooseAll.IsSelected)
{
- function.roomIds.Add(room.uid);
+ function.roomIds.Add(room.roomId);
}
else
{
- function.roomIds.Remove(room.uid);
+ function.roomIds.Remove(room.roomId);
}
function.SaveFunctionData(true);
}
@@ -70,16 +70,16 @@
{
if (isAdd)
{
- function.roomIds.Add(room.uid);
+ function.roomIds.Add(room.roomId);
room.AddRoomFunction(function);
}
else
{
- function.roomIds.Remove(room.uid);
+ function.roomIds.Remove(room.roomId);
room.RemoveRoomFunction(function);
}
function.SaveFunctionData(true);
- if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
+ if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0