From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' 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 cb64da5..d7f64c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -51,13 +51,13 @@
{
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();
+ function.SaveFunctionData(true);
}
Entity.SpatialInfo.CurrentSpatial.InitRoomFunction();
};
@@ -70,15 +70,15 @@
{
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();
+ function.SaveFunctionData(true);
if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
{
btnChooseAll.IsSelected = true;
--
Gitblit v1.8.0