浏览代码

修改 HotspotName 属性的逻辑检查条件

对 `OneHotspotName`、`TwoHotspotName`、`ThreeHotspotName`、`FourHotspotName` 和 `FiveHotspotName` 属性的逻辑进行了修改。原来的逻辑是检查 `HotSpotFullName` 是否不为空,并且通过 `Split("-")` 分割后长度大于等于相应的级别,并且分割后的字符串与 `HotspotName` 相等。修改后的逻辑是检查 `HotSpotFullName` 是否不为空,并且通过 `Split("-")` 分割后长度等于相应的级别。
田爽 2 周之前
父节点
当前提交
aed65aa3d2
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/Hotline.Share/Dtos/StatisticalReport/OrderDelayStatisicalReturnDto.cs

+ 5 - 5
src/Hotline.Share/Dtos/StatisticalReport/OrderDelayStatisicalReturnDto.cs

@@ -65,27 +65,27 @@ namespace Hotline.Share.Dtos.StatisticalReport
 		/// <summary>
 		/// 一级热点
 		/// </summary>
-		public string OneHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 1 && HotSpotFullName.Split("-")[0] == HotspotName ? HotSpotFullName.Split("-")[0] : string.Empty;
+		public string OneHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length == 1  ? HotSpotFullName.Split("-")[0] : string.Empty;
 
         /// <summary>
         /// 二级热点
         /// </summary>
-        public string TwoHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 2 && HotSpotFullName.Split("-")[1] == HotspotName ? HotSpotFullName.Split("-")[1] : string.Empty;
+        public string TwoHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length == 2  ? HotSpotFullName.Split("-")[1] : string.Empty;
 
         /// <summary>
         /// 三级热点
         /// </summary>
-        public string ThreeHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 3 && HotSpotFullName.Split("-")[2] == HotspotName ? HotSpotFullName.Split("-")[2] : string.Empty;
+        public string ThreeHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length == 3 ? HotSpotFullName.Split("-")[2] : string.Empty;
 
         /// <summary>
         /// 四级热点
         /// </summary>
-        public string FourHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 4 && HotSpotFullName.Split("-")[3] == HotspotName ? HotSpotFullName.Split("-")[3] : string.Empty;
+        public string FourHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length == 4  ? HotSpotFullName.Split("-")[3] : string.Empty;
 
         /// <summary>
         /// 五级热点
         /// </summary>
-        public string FiveHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 5 && HotSpotFullName.Split("-")[4] == HotspotName ? HotSpotFullName.Split("-")[4] : string.Empty;
+        public string FiveHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length == 5 ? HotSpotFullName.Split("-")[4] : string.Empty;
 
 
         public int SumCount { get; set; }