Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1763,7 +1763,13 @@ namespace Myshipping.Application
                         await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
 
                     }
+                    var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
+                    if (!string.IsNullOrEmpty(itemcode))
+                    {
+                        if (itemcode == "true")
                             await _bookingorderservice.SendBookingOrder(order.Select(x => x.Id).ToArray());
+                    }
+                  
 
 
                 }

Myshipping.Core/Service/User/SysDataUserMenu.cs

@@ -162,18 +162,18 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I
 
         List<SysDataUserMenu> list = new List<SysDataUserMenu>();
         List<long> datascope = new List<long>();
-        //if (_sysCache.Exists(CommonConst.CACHE_KEY_USERDATASCOPE))
-        //{
-        //    list = await _sysCache.GetAsync<List<SysDataUserMenu>>(CommonConst.CACHE_KEY_USERDATASCOPE);
-
-        //}
-        //else
-        //{
-        //    list = await _rep.AsQueryable().ToListAsync();
-        //    _sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPE, list);
-        //}
+        if (_sysCache.Exists(CommonConst.CACHE_KEY_USERDATASCOPE))
+        {
+            list = await _sysCache.GetAsync<List<SysDataUserMenu>>(CommonConst.CACHE_KEY_USERDATASCOPE);
+
+        }
+        else
+        {
             list = await _rep.AsQueryable().ToListAsync();
             _sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPE, list);
+        }
+        //list = await _rep.AsQueryable().ToListAsync();
+        //_sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPE, list);
         DataScopeType _dataScopeType = list.Where(x => x.SysMenuId == menuid && x.SysUserId == UserManager.UserId).Select(x => x.DataScopeType).FirstOrDefault();
         if (_dataScopeType == DataScopeType.ALL)
         {