diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
index 48fe3dbf..6e8c44bd 100644
--- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
@@ -66,9 +66,16 @@ public class TrackPullService : ApplicationService
///
///
[HttpGet("GetDetail")]
- public async Task GetDetailAsync(int id)
+ public async Task GetDetailAsync(int id)
{
- return await _trackPullConfigRepository.GetDetailAsync(id);
+ var res = await _trackPullConfigRepository.GetDetailAsync(id);
+
+ if (res == null)
+ {
+ throw new BusinessException(message: "轨迹拉取配置不存在");
+ }
+
+ return res;
}
///
diff --git a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs
index 49e4d489..5135b843 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackPullConfigRepository.cs
@@ -15,12 +15,9 @@ public class TrackPullConfigRepository : BasicRepository,
{
public async Task> GetPageAsync(KeywordsInputVO input)
{
- return await AsQueryable()
- .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id && !system.IsDeleted)
- .LeftJoin((trackPull, system, service) =>
- trackPull.ServiceProviderId == service.Id && !service.IsDeleted)
- .Filter(null, true)
- .Where(trackPull => !trackPull.IsDeleted)
+ return await Context.Queryable()
+ .LeftJoin((trackPull, system) => trackPull.SubSystemId == system.Id)
+ .LeftJoin((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!))