ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：查询到已经删除的拉取配置

Browse Source
This commit is contained in:
xiaolipro 2024-09-25 15:09:11 +08:00
parent 05573fd12d
commit 4d84e4283a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
View File

@ -66,9 +66,16 @@ public class TrackPullService : ApplicationService
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("GetDetail")] [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> /// <summary>

9
src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs
View File

@ -15,12 +15,9 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
{ {
public async Task<UnifyPageResultDto<GetTrackPullConfigPageOutputVO>> GetPageAsync(KeywordsInputVO input) public async Task<UnifyPageResultDto<GetTrackPullConfigPageOutputVO>> GetPageAsync(KeywordsInputVO input)
{ {
return await AsQueryable() return await Context.Queryable<TrackPullConfigEntity>()
.LeftJoin<VSystemEntity>((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted) .LeftJoin<VSystemEntity>((trackPull, system) => trackPull.SubSystemId == system.Id)
.LeftJoin<VServiceProviderEntity>((trackPull, system, service) => .LeftJoin<VServiceProviderEntity>((trackPull, system, service) => trackPull.ServiceProviderId == service.Id)
trackPull.ServiceProviderId == service.Id && !service.IsDeleted)
.Filter(null, true)
.Where(trackPull => !trackPull.IsDeleted)
.WhereIF(input.SubSystemId.HasValue, trackPull => trackPull.SubSystemId == input.SubSystemId) .WhereIF(input.SubSystemId.HasValue, trackPull => trackPull.SubSystemId == input.SubSystemId)
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(), .WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
(trackPull, system, service) => service.Name.Contains(input.Keywords!)) (trackPull, system, service) => service.Name.Contains(input.Keywords!))