2020-12-08-001

陈嘉乐

2020-12-08 52c84c10c3f77156f73566cb9793616e2a25dddd

 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;
@@ -271,7 +287,22 @@
        public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;

        #region 功能数据
        public static FunctionList functionList = FunctionList.List;
        static FunctionList _functionList;
        public static FunctionList functionList
        {
            get
            {
                if (_functionList == null)
                {
                    _functionList = FunctionList.List;
                }
                return _functionList;
            }
            set
            {
                _functionList = value;
            }
        }

        /// <summary>
        /// 刷新住宅里面的搜索设备状态