From 551e82d33c9c23442e0ecd320bcfc752f300d9ef Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 22 三月 2021 09:20:03 +0800 Subject: [PATCH] Merge branch 'temp-wxr' into WJC --- HDL_ON/Common/FileUtlis.cs | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/HDL_ON/Common/FileUtlis.cs b/HDL_ON/Common/FileUtlis.cs index 0d3e2f2..63a3e07 100644 --- a/HDL_ON/Common/FileUtlis.cs +++ b/HDL_ON/Common/FileUtlis.cs @@ -48,6 +48,10 @@ { get { + if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null) + { + return AccountPath; + } if (string.IsNullOrEmpty(regionPath) || !regionPath.Contains(DB_ResidenceData.Instance.CurrentRegion.RegionID )) { regionPath = Path.Combine(AccountPath, DB_ResidenceData.Instance.CurrentRegion.RegionID); @@ -305,6 +309,9 @@ } } }); + }else + { + action?.Invoke(); } } -- Gitblit v1.8.0