gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'revert! fix: 😀修复非默认租户获取不到公共字典值的bug' (#248) from jasondom/Admin.NET.Pro:v2 into v2

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/248
This commit is contained in:
zuohuaijun 2025-01-21 12:55:21 +08:00
commit a6b8e80aa6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
View File

@ -158,7 +158,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
{
dictDataList = await _sysDictDataRep.AsQueryable().ClearFilter()
.InnerJoin<SysDictType>((u, a) => u.DictTypeId == a.Id)
.Where((u, a) => a.SysFlag == YesNoEnum.Y && u.TenantId == SqlSugarConst.DefaultTenantId || (a.SysFlag == YesNoEnum.N && u.TenantId == _userManager.TenantId))
.Where((u, a) => a.SysFlag == YesNoEnum.Y || u.TenantId == _userManager.TenantId)
.Where(u => u.DictTypeId == dictTypeId).OrderBy(u => new { u.OrderNo, u.Code }).ToListAsync();
_sysCacheService.Set($"{CacheConst.KeyDict}{dictType.Code}", dictDataList);
}
@ -178,7 +178,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
{
dictDataList = await _sysDictDataRep.Change<SysDictType>().AsQueryable()
.LeftJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
.Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId))
.Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId)
.Where((u, a) => u.Code == code && u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable)
.OrderBy((u, a) => new { a.OrderNo, a.Code })
.Select((u, a) => a).ToListAsync();
@ -197,7 +197,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
{
return await _sysDictDataRep.Change<SysDictType>().AsQueryable()
.LeftJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
.Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId))
.Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId)
.Where((u, a) => u.Code == input.Code)
.WhereIF(input.Status.HasValue, (u, a) => u.Status == (StatusEnum)input.Status.Value && a.Status == (StatusEnum)input.Status.Value)
.OrderBy((u, a) => new { a.OrderNo, a.Code })

2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs
View File

@ -162,7 +162,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
{
var ds = await _sysDictTypeRep.AsQueryable()
.InnerJoin<SysDictData>((u, a) => u.Id == a.DictTypeId).ClearFilter()
.Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId))
.Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId)
.Where((u, a) => u.IsDelete == false && a.IsDelete == false && u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable)
.Select((u, a) => new { TypeCode = u.Code, a.Code, a.Name, a.Value, a.Remark, a.OrderNo, a.TagType, a.ExtData })
.ToListAsync();