From 3f752e5d4c19cc5757a6dcf73118d4da41836c40 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 22:18:14 +0800
Subject: [PATCH] 2020-12-23 1.修复点击全部没有功能设备问题

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs |   13 +++++++++++--
 1 files changed, 11 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
old mode 100755
new mode 100644
index bec504f..812ab5c
--- 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();
             };
@@ -119,6 +127,7 @@
                 if (string.IsNullOrEmpty(room.roomId))//鏂板鐨勬埧闂达紝浜戠鏈垱寤簉oomid 鏃犳硶淇濆瓨鏁版嵁
                 {
                     newRoomAddFunction(changeList);
+                    bodyView.RemoveFromParent();
                 }
                 else
                 {

--
Gitblit v1.8.0