Browse Source

😁1、调整超管机构树显示 2、调整sqlsugar二级缓存

zuohuaijun 2 years ago
parent
commit
cd4c81ac81

+ 5 - 1
Admin.NET/Admin.NET.Core/Cache/SqlSugarCache.cs

@@ -14,7 +14,11 @@ namespace Admin.NET.Core;
 /// </summary>
 public class SqlSugarCache : ICacheService
 {
-    private static readonly ICache _cache = App.GetService(typeof(ICache)) as ICache;
+    /// <summary>
+    /// 内存缓存
+    /// </summary>
+    //private static readonly ICache _cache = App.GetService(typeof(ICache)) as ICache;
+    private static readonly ICache _cache = Cache.Default;
 
     public void Add<V>(string key, V value)
     {

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -61,14 +61,14 @@ public class SysOrgService : IDynamicApiController, ITransient
                 .ToListAsync();
         }
 
+        var sysOrg = await _sysOrgRep.GetSingleAsync(u => u.Id == input.Id);
         var orgTree = new List<SysOrg>();
         if (_userManager.SuperAdmin)
         {
-            orgTree = await iSugarQueryable.ToTreeAsync(u => u.Children, u => u.Pid, input.Id);
+            orgTree = await iSugarQueryable.ToTreeAsync(u => u.Children, u => u.Pid, sysOrg?.Pid);
         }
         else
         {
-            var sysOrg = await _sysOrgRep.GetSingleAsync(u => u.Id == input.Id);
             orgTree = await iSugarQueryable.ToTreeAsync(u => u.Children, u => u.Pid, sysOrg?.Pid, userOrgIdList.Select(d => (object)d).ToArray());
             // 递归禁用没权限的机构(防止用户修改或创建无权的机构和用户)
             HandlerOrgTree(orgTree, userOrgIdList);