|
|
@@ -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);
|