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/21-cooling/AssetsCoolingSingleMatchingCtrl.cs |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
index 4d34f87..ee5d9e4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
@@ -25,11 +25,14 @@
         {
             var allList = await BLLFactory<HStation.BLL.AssetsCoolingMain>.Instance.GetAll();
             _allList = new List<AssetsCoolingSingleMatchingViewModel>();
-            allList.ForEach(x => _allList.Add(new AssetsCoolingSingleMatchingViewModel(x)));
-            if (long.TryParse(dbId, out long id))
+            if (allList != null)
             {
-                var item = allList?.Find(x => x.ID == id);
-                _selected = item;
+                allList.ForEach(x => _allList.Add(new AssetsCoolingSingleMatchingViewModel(x)));
+                if (long.TryParse(dbId, out long id))
+                {
+                    var item = allList?.Find(x => x.ID == id);
+                    _selected = item;
+                }
             }
             Search();
             await Task.Delay(300);

--
Gitblit v1.9.3