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/2-Classification/FunctionPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 3ffeb1b..27feb96 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -245,7 +245,7 @@
List<Room> roomList = new List<Room>();
- roomList.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.All) });
+ roomList.Add(new Room() { roomName = Language.StringByID(StringId.All) });
roomList.AddRange(DB_ResidenceData.residenceData.Rooms);
foreach (var tempRoom in roomList)
{
@@ -288,7 +288,7 @@
var showList = new List<Function>();
foreach (var sf in functionList)
{
- if(sf.roomIds.Contains(tempRoom.uid))
+ if(sf.roomIds.Contains(tempRoom.roomId))
{
showList.Add(sf);
}
--
Gitblit v1.8.0