From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
index 19708a4..58130ee 100644
--- a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
+++ b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
@@ -40,7 +40,7 @@
mFirstList.Clear();
foreach (var room in roomList)
{
- mFirstList.Add(new RoomCellInfo() { Title = room.roomName, TagId = room.roomId });
+ mFirstList.Add(new RoomCellInfo() { Title = room.roomName, TagId = room.uid });
}
var roomSelectPopupDialog = new DiySelectPopupDialog();
roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag);
@@ -52,12 +52,12 @@
//涓�绾ф暟缁勪负妤煎眰
foreach (var floor in floorList)
{
- mFirstList.Add(new RoomCellInfo() { Title = floor.roomName, TagId = floor.roomId });
+ mFirstList.Add(new RoomCellInfo() { Title = floor.roomName, TagId = floor.uid });
var mList = new List<RoomCellInfo>();
- var allRoom = roomList.FindAll((room) => room.parentId == floor.roomId);
+ var allRoom = roomList.FindAll((room) => room.parentId == floor.uid);
foreach (var mRoom in allRoom)
{
- mList.Add(new RoomCellInfo() { Title = mRoom.roomName, TagId = mRoom.roomId });
+ mList.Add(new RoomCellInfo() { Title = mRoom.roomName, TagId = mRoom.uid });
}
if(mList == null)
--
Gitblit v1.8.0