Просмотр исходного кода

!1779 fix: 修复非租户字典获取不到的问题
Merge pull request !1779 from 阿凡达/N/A

zuohuaijun 10 месяцев назад
Родитель
Сommit
589d341efe
1 измененных файлов с 12 добавлено и 1 удалено
  1. 12 1
      Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

+ 12 - 1
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -200,12 +200,23 @@ public class SysDictDataService : IDynamicApiController, ITransient
         {
             //平台字典和租户字典分开缓存
             if (dictType.IsTenant == YesNoEnum.Y)
+            {
                 dictDataList = await _sysDictDataRep.Change<SysDictDataTenant>().AsQueryable()
+                       .Where(u => u.DictTypeId == dictType.Id)
+                       .Where(u => u.Status == StatusEnum.Enable)
+                       .WhereIF(_userManager.SuperAdmin, d => d.TenantId == _userManager.TenantId).Select<SysDictData>()
+                       .OrderBy(u => new { u.OrderNo, u.Value, u.Code })
+                       .ToListAsync();
+            }
+            else
+            {
+                dictDataList = await _sysDictDataRep.AsQueryable()
                     .Where(u => u.DictTypeId == dictType.Id)
                     .Where(u => u.Status == StatusEnum.Enable)
-                    .WhereIF(_userManager.SuperAdmin, d => d.TenantId == _userManager.TenantId).Select<SysDictData>()
                     .OrderBy(u => new { u.OrderNo, u.Value, u.Code })
                     .ToListAsync();
+            }
+
             _sysCacheService.Set(dicKey, dictDataList);
         }
         return dictDataList;