From be3e4f6d2dd0529b87204169bce6df55c37a4199 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
index 9ffa425..0944a88 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
@@ -42,18 +42,21 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsTankMain>.Instance.GetAll();
- _allList = new List<AssetsTankSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsTankSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbid = curveId;
+ }
+ Search();
}
- if (long.TryParse(curveDbId, out long curveId))
- {
- _curveDbid = curveId;
- }
- Search();
await Task.Delay(300);
if (_selected != null)
{
--
Gitblit v1.9.3