From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 86441aa..194cb18 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -46,16 +46,16 @@
}
}
}
- function.roomIdList.Clear();
- foreach (var room in Entity.DB_ResidenceData.rooms)
+ function.roomIds.Clear();
+ foreach (var room in Entity.DB_ResidenceData.Rooms)
{
if (btnChooseAll.IsSelected)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.uid);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
}
function.SaveFunctionData();
}
@@ -70,16 +70,16 @@
{
if (isAdd)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.uid);
room.AddRoomFunction(function);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
room.RemoveRoomFunction(function);
}
function.SaveFunctionData();
- if (function.roomIdList.Count == Entity.DB_ResidenceData.rooms.Count)
+ if (function.roomIds.Count == Entity.DB_ResidenceData.Rooms.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0