yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix .

Browse Source
This commit is contained in:
liguoyang
2025-03-21 10:22:59 +08:00
parent e3cc31ec6a
commit e6dd90617c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -1,6 +1,7 @@
using Dlhis.Basic.Device.Dtos; using Dlhis.Basic.Device.Dtos;
using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Device.Response; using Dlhis.Basic.Device.Response;
using Dlhis.Basic.Organization.Services;
using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Entities;
@@ -24,18 +25,21 @@ public class DevicePermissionService : IDevicePermissionService
private readonly IDbContext _dbContext; private readonly IDbContext _dbContext;
private readonly ITenantApi _tenantApi; private readonly ITenantApi _tenantApi;
private readonly INamedResolver _namedResolver; private readonly INamedResolver _namedResolver;
private readonly IFactorySettingService _factorySettingService;
private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService; private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService;
private readonly ICurrentUser _currentUser; private readonly ICurrentUser _currentUser;
public DevicePermissionService(IDbContext dbContext, public DevicePermissionService(IDbContext dbContext,
ITenantApi tenantApi, ITenantApi tenantApi,
INamedResolver namedResolver, INamedResolver namedResolver,
IFactorySettingService factorySettingService,
IDevicePermissionAnalyzeService devicePermissionAnalyzeService, IDevicePermissionAnalyzeService devicePermissionAnalyzeService,
ICurrentUser currentUser) ICurrentUser currentUser)
{ {
_dbContext = dbContext; _dbContext = dbContext;
_tenantApi = tenantApi; _tenantApi = tenantApi;
_namedResolver = namedResolver; _namedResolver = namedResolver;
_factorySettingService = factorySettingService;
_devicePermissionAnalyzeService = devicePermissionAnalyzeService; _devicePermissionAnalyzeService = devicePermissionAnalyzeService;
_currentUser = currentUser; _currentUser = currentUser;
} }
@@ -284,16 +288,13 @@ public class DevicePermissionService : IDevicePermissionService
} }
ids = ids.Distinct().ToList(); ids = ids.Distinct().ToList();
var enableOutsourceDown = await _dbContext.Queryable<FactorySettingEntity>() var factorySetting = await _factorySettingService.GetFactorySettingAsync(device.TenantId, false);
.Where(x => x.TenantId == device.TenantId)
.Select(x => SqlFunc.IsNullOrEmpty(x.EnableOutsourceDown) ? true : x.EnableOutsourceDown)
.SingleAsync();
var page = await _dbContext.Queryable<GainfoEntity>() var page = await _dbContext.Queryable<GainfoEntity>()
.Where(x => ids.Contains(x.Id)) .Where(x => ids.Contains(x.Id))
.Where(x => x.Type != GainfoUserTypeEnumType.External) .Where(x => x.Type != GainfoUserTypeEnumType.External)
.WhereIF(enableOutsourceDown == false, x => x.Type != GainfoUserTypeEnumType.Outsource) .WhereIF(factorySetting.EnableOutsourceDown == false, x => x.Type != GainfoUserTypeEnumType.Outsource)
.WhereIF(device.Type == DeviceTypeEnumType.Meal, x => x.Type != GainfoUserTypeEnumType.External && x.Type != GainfoUserTypeEnumType.Outsource) .WhereIF(device.Type == DeviceTypeEnumType.Meal, x => x.Type != GainfoUserTypeEnumType.External && x.Type != GainfoUserTypeEnumType.Outsource)
.WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name.Contains(request.Search)) .WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name.Contains(request.Search))
.Select<DeviceGainfoResponse>() .Select<DeviceGainfoResponse>()