From 713d5218ee2b47c0c92f75c19c49bb7e883cd214 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 25 七月 2024 13:35:51 +0800
Subject: [PATCH] nuget包升级
---
WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs b/WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs
index 8859a81..813307b 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs
@@ -18,9 +18,11 @@
/// <returns></returns>
public List<(DateTime, DateTime, int, double, double, double)> MergeTimeSlots(List<(DateTime, DateTime, double, double, double)> Date)
{
+ if(Date==null)
+ return null;
List<(DateTime, DateTime, int, double, double, double)> mergedSlots = new List<(DateTime, DateTime, int, double, double, double)>(); // 鍒濆鍖栧悎骞跺悗鐨勫垪琛�
- Date.Sort((x, y) => x.Item1.CompareTo(y.Item1)); // 鎸夌収璧峰鏃堕棿鎺掑簭
+ Date.Sort((x, y) => x.Item2.CompareTo(y.Item2)); // 鎸夌収璧峰鏃堕棿鎺掑簭
if (Date.Count==0)
return null;
DateTime mergedStart = Date[0].Item1;
--
Gitblit v1.9.3