From f8db5f99ba4b27481dde14f9787f32fa2dab200d Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 5 Jul 2024 18:23:27 +0800 Subject: [PATCH] fix . --- Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index f8fc04cf..e096020d 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -32,15 +32,13 @@ public class DeviceService : IDeviceService public async Task> GetPageAsync(DevicePageRequest request) { - var role = _currentUser.GetRole(); - var isAll = role is "tenant-admin" or "admin"; var tenantId = _currentUser.GetStringTenantId(); var page = await _dbContext.Queryable() .LeftJoin((d, dt) => d.TemplateCode == dt.Code) .LeftJoin((d, dt, dr) => d.UniqueNo == dr.DeviceUniqueNo) .LeftJoin((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code) - .WhereIF(isAll, d => tenantId == d.TenantId) + .Where(d => tenantId == d.TenantId) .WhereIF(request.Type.HasValue, (d, dt) => d.Type == request.Type) .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable) .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search))