From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 11 十二月 2020 11:34:14 +0800 Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath" --- HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs index 4a8bae7..e2b2aa8 100644 --- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs @@ -599,7 +599,6 @@ { //璺宠浆椤甸潰---- MainPage.GoUserPage(); - MainPage.InitializationData(); return; } }); @@ -615,8 +614,8 @@ */ /* - 鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁 - 瀛樺湪鍒欏鍑� + * 鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁 + * 瀛樺湪鍒欏鍑� */ var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID); if (isExis) @@ -632,7 +631,6 @@ { //璺宠浆椤甸潰---- MainPage.GoUserPage(); - MainPage.InitializationData(); }); } else @@ -759,12 +757,13 @@ var responsePack = pm.GetHomePager(); if (responsePack == StateCode.SUCCESS) { - //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔� - if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0) - { - result = true; - } - //result = true; + ////2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔� + //if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0) + //{ + // result = true; + //} + //2020-12-10 娌℃湁浣忓畢鐧诲綍鎴愬姛锛屼絾鏄笉鑳借繘鍏ヤ富鐣岄潰 + result = true; } else { -- Gitblit v1.8.0