whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
optimize
jianghaiqing 2 years ago
parent ca43793c99 57b9aa9c26
commit c931b91d45
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
Myshipping.Application/Service/DataSync/DataSyncService.cs
Unescape Escape View File

@ -1763,7 +1763,13 @@ namespace Myshipping.Application
await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
}
await _bookingorderservice.SendBookingOrder(order.Select(x => x.Id).ToArray());
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());
}
}

24
Myshipping.Core/Service/User/SysDataUserMenu.cs
Unescape Escape View File

@ -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);
//}
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)
{

Write Preview
Loading…
Cancel
Save