From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'

---
 HDL_ON/Entity/DB_ResidenceData.cs |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5410f8b..f733b0e 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -30,6 +30,22 @@
                 else
                 {
                     var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+                    if (curRegion == null)
+                    {
+                        if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+                        {
+                            CurReginID = UserInfo.Current.regionList[0].RegionID;
+                            //鎭㈠澶囦唤
+                            HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+                            return UserInfo.Current.regionList[0];
+                        }
+                        else
+                        {
+                            return new RegionInfoRes();
+                        }
+                    }
+
                     //if (curRegion == null)
                     //{
                     //    CurReginID =  UserInfo.Current.regionList[0].RegionID;

--
Gitblit v1.8.0