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

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<List<long>> GetDataScopeList(long menuid,bool IsEdit=false)
     {
         List<SysDataUserMenu> list = new List<SysDataUserMenu>();
-        List<SysUserDataScope> zdylist = new List<SysUserDataScope>();
         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);
         }
-        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<SysEmp>((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;