From d814c978efc068425c500a553cf7ec6b4f628219 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 22:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
index bdffce7..efaa6ac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
@@ -103,8 +103,16 @@
lastButton.IsSelected = false;
}
btn.IsSelected = true;
- showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
- LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
+ //showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
+ showedFunctionRoomId = btn.Tag.ToString();
+ if (showedFunctionRoomId == "0")
+ {
+ LoadFunctionListRow(allocatedList);
+ }
+ else
+ {
+ LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
+ }
btnChoosedRoom.Text = chooseRoomName;
dialog.Close();
};
--
Gitblit v1.8.0