From e29de9af8f507d288a61d9459fb3d1f72976876f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 10:40:08 +0800
Subject: [PATCH] 2020-05-18-1
---
HDL_ON/Entity/Room.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 68ca3dd..7884d78 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -19,6 +19,10 @@
/// 鎴块棿ID
/// </summary>
public string sid;
+ /// <summary>
+ /// 妤煎眰绱㈠紩
+ /// </summary>
+ public int floorIndex = -1;
/// <summary>
/// 鎴块棿鑳屾櫙
@@ -39,28 +43,25 @@
return str;
}
}
- /// <summary>
- /// 妤煎眰绱㈠紩
- /// </summary>
- public int floorIndex = -1;
+
/// <summary>
/// 鎴块棿鍔熻兘鍒楄〃
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public List<Function> functionData = new List<Function>();
+ public List<Function> functions = new List<Function>();
public void RefreshFunctions()
{
List<Function> funcList = new List<Function>();
foreach (var f in DB_ResidenceData.residenceData.functionList.functions)
{
- if (f.roomIdList.Contains(sid))
+ if (f.roomIdList.Contains(sid) && sid != null)
{
funcList.Add(f);
}
}
- functionData = funcList;
+ functions = funcList;
}
}
}
--
Gitblit v1.8.0