This commit is contained in:
2025-04-24 17:53:26 +08:00
parent 7c4654ee52
commit 11878dd1b9

View File

@@ -14,16 +14,18 @@ namespace Dlhis.Basic.Device.Services.Implements;
public class DevicePermissionManuallyService : IDevicePermissionManuallyService public class DevicePermissionManuallyService : IDevicePermissionManuallyService
{ {
private readonly IDbContext _dbContext; private readonly IDbContext _dbContext;
private readonly ILogger<DevicePermissionManuallyService> _logger;
public DevicePermissionManuallyService(IDbContext dbContext) public DevicePermissionManuallyService(IDbContext dbContext, ILogger<DevicePermissionManuallyService> logger)
{ {
_dbContext = dbContext; _dbContext = dbContext;
_logger = logger;
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto) public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto)
{ {
return await _dbContext.Queryable<DevicePermissionManuallyEntity>() var query = _dbContext.Queryable<DevicePermissionManuallyEntity>()
.LeftJoin<DeviceEntity>((x, d) => x.DeviceCode == d.Code) .LeftJoin<DeviceEntity>((x, d) => x.DeviceCode == d.Code)
.LeftJoin<GainfoEntity>((x, d, g) => x.UserNo == g.No) .LeftJoin<GainfoEntity>((x, d, g) => x.UserNo == g.No)
.WhereIF(requestDto.Search.IsPresent(), (x, d, g) => g.Code == requestDto.Search || g.Name.Contains(requestDto.Search)) .WhereIF(requestDto.Search.IsPresent(), (x, d, g) => g.Code == requestDto.Search || g.Name.Contains(requestDto.Search))
@@ -37,8 +39,10 @@ public class DevicePermissionManuallyService : IDevicePermissionManuallyService
UserNo = x.UserNo, UserNo = x.UserNo,
UserName = g.Code + " " + g.Name, UserName = g.Code + " " + g.Name,
Type = d.Type Type = d.Type
}) });
.ToPageListAsync(requestDto);
_logger.LogInformation(query.ToSqlString());
return await query.ToPageListAsync(requestDto);
} }
/// <inheritdoc /> /// <inheritdoc />