fix:查询到已经删除的拉取配置
This commit is contained in:
parent
05573fd12d
commit
4d84e4283a
@ -66,9 +66,16 @@ public class TrackPullService : ApplicationService
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("GetDetail")]
|
||||
public async Task<GetTrackPullConfigDetailOutputVO?> GetDetailAsync(int id)
|
||||
public async Task<GetTrackPullConfigDetailOutputVO> GetDetailAsync(int id)
|
||||
{
|
||||
return await _trackPullConfigRepository.GetDetailAsync(id);
|
||||
var res = await _trackPullConfigRepository.GetDetailAsync(id);
|
||||
|
||||
if (res == null)
|
||||
{
|
||||
throw new BusinessException(message: "轨迹拉取配置不存在");
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -15,12 +15,9 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
|
||||
{
|
||||
public async Task<UnifyPageResultDto<GetTrackPullConfigPageOutputVO>> GetPageAsync(KeywordsInputVO input)
|
||||
{
|
||||
return await AsQueryable()
|
||||
.LeftJoin<VSystemEntity>((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted)
|
||||
.LeftJoin<VServiceProviderEntity>((trackPull, system, service) =>
|
||||
trackPull.ServiceProviderId == service.Id && !service.IsDeleted)
|
||||
.Filter(null, true)
|
||||
.Where(trackPull => !trackPull.IsDeleted)
|
||||
return await Context.Queryable<TrackPullConfigEntity>()
|
||||
.LeftJoin<VSystemEntity>((trackPull, system) => trackPull.SubSystemId == system.Id)
|
||||
.LeftJoin<VServiceProviderEntity>((trackPull, system, service) => trackPull.ServiceProviderId == service.Id)
|
||||
.WhereIF(input.SubSystemId.HasValue, trackPull => trackPull.SubSystemId == input.SubSystemId)
|
||||
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
|
||||
(trackPull, system, service) => service.Name.Contains(input.Keywords!))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user