diff --git a/Myshipping.Core/Service/User/SysDataUserMenu.cs b/Myshipping.Core/Service/User/SysDataUserMenu.cs index d1f505b6..9768eb91 100644 --- a/Myshipping.Core/Service/User/SysDataUserMenu.cs +++ b/Myshipping.Core/Service/User/SysDataUserMenu.cs @@ -92,7 +92,7 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I }); await _rep.InsertAsync(list); - var userdatalist = _rep.AsQueryable().ToListAsync(); + var userdatalist = await _rep.AsQueryable().ToListAsync(); _sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPE, userdatalist); } catch (System.Exception) @@ -137,7 +137,7 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I }); await _sysUserDataScopeRep.InsertAsync(list); - var userdatalist = _sysUserDataScopeRep.AsQueryable().ToListAsync(); + var userdatalist = await _sysUserDataScopeRep.AsQueryable().ToListAsync(); _sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPEZDY, userdatalist); } @@ -157,19 +157,17 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I public async Task> GetDataScopeList(long menuid,bool IsEdit=false) { List list = new List(); - List zdylist = new List(); List datascope = new List(); if (_sysCache.Exists(CommonConst.CACHE_KEY_USERDATASCOPE)) { list = await _sysCache.GetAsync>(CommonConst.CACHE_KEY_USERDATASCOPE); - } else { list = await _rep.AsQueryable().ToListAsync(); _sysCache.Set(CommonConst.CACHE_KEY_USERDATASCOPE, list); } - DataScopeType _dataScopeType = list.Where(x => x.SysMenuId == menuid && x.SysUserId == UserManager.UserId).WhereIF(IsEdit==true,x=>x.IsEdit==true).Select(x => x.DataScopeType).FirstOrDefault(); + DataScopeType _dataScopeType = list.Where(x => x.SysMenuId == menuid && x.SysUserId == UserManager.UserId).WhereIF(IsEdit == true, x => x.IsEdit == true).Select(x => x.DataScopeType).FirstOrDefault(); if (_dataScopeType == DataScopeType.ALL) { datascope = null; @@ -194,10 +192,10 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I else if (_dataScopeType == DataScopeType.DEFINE) { datascope = await _sysUserDataScopeRep.AsQueryable().InnerJoin((d, t) => d.SysOrgId == t.OrgId && d.SysMenuId == menuid && d.SysUserId == UserManager.UserId) - .WhereIF(IsEdit == true, (d, t) =>d.IsEdit==true).Select((d, t) => t.Id).ToListAsync(); + .WhereIF(IsEdit == true, (d, t) => d.IsEdit == true).Select((d, t) => t.Id).ToListAsync(); } - else { - + else + { datascope.Add(UserManager.UserId); } return datascope;