From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs
index 9cf4037..fecf5d3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-autoMatching/02-AsstesFormCtrl/AssetsMatchingHelper.cs
@@ -612,6 +612,10 @@
         private static int CountCommonCharacters(string baseString, string compareString)
         {
             // 灏嗗瓧绗︿覆杞崲涓哄瓧绗﹂泦鍚�
+            if (baseString == string.Empty||baseString==null || compareString == string.Empty||compareString==null)
+            {
+                return 0;
+            }
             HashSet<char> baseChars = new HashSet<char>(baseString);
             HashSet<char> comparisonChars = new HashSet<char>(compareString);
             // 璁$畻涓や釜闆嗗悎鐨勪氦闆�

--
Gitblit v1.9.3