Эх сурвалжийг харах

修复非超级管理员获取所有字典为空的问题

Ir0nMax 1 жил өмнө
parent
commit
2b4b1fe6a4

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -157,9 +157,9 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     [DisplayName("获取所有字典集合")]
     public async Task<dynamic> GetAllDictList()
     {
-        var ds = await GetSysDictDataQueryable()
-            .InnerJoin<SysDictData>((u, a) => u.Id == a.DictTypeId)
-            .Where((u, a) => u.IsDelete == false && a.Status == StatusEnum.Enable)
+        var ds = await GetSysDictDataQueryable().ClearFilter()
+            .InnerJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
+            .Where((u, a) => u.IsDelete == false && u.Status == StatusEnum.Enable && a.IsDelete == false && a.Status == StatusEnum.Enable)
             .Select((u, a) => new { TypeCode = u.Code, a.Label, a.Value, a.Name, a.TagType, a.StyleSetting, a.ClassSetting, a.ExtData, a.Remark, a.OrderNo, a.Status })
             .ToListAsync();
         return ds.OrderBy(u => u.OrderNo).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);

+ 1 - 1
Web/.env

@@ -2,7 +2,7 @@
 VITE_PORT = 8888
 
 # open 运行 npm run dev 时自动打开浏览器
-VITE_OPEN = false
+VITE_OPEN = true
 
 # 打包是否开启 cdn(源文件 utils/build.ts),可自行修改
 VITE_OPEN_CDN = false