diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs index d193eb8e..a591adf7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs @@ -21,4 +21,9 @@ public class GetPageTrackTemplateListInput : PageInfoInput /// 模板code /// public string? TemplateCode { get; set; } + + /// + /// 关键字 + /// + public string? KeyWord { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs index b6e253a0..f801ffdc 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs @@ -1,8 +1,8 @@ namespace SJZY.Track.Domain.Dtos.TrackTemplate; -public class GetPageTrackTemplateListInputVo :PageInfoInput +public class GetPageTrackTemplateListInputVo : PageInfoInput { - /// + /// /// 子系统id /// public int SubSystemId { get; set; } @@ -21,4 +21,9 @@ public class GetPageTrackTemplateListInputVo :PageInfoInput /// 模板code /// public string? TemplateCode { get; set; } + + /// + /// 关键字 + /// + public string? KeyWord { get; set; } } diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs index c7f7c2c4..d399bcd1 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -250,6 +250,11 @@ public class TrackTemplateRepository : BasicRepository, ITr .LeftJoin((a, b, c) => b.TrackStatusId == c.Id) .LeftJoin((a, b, c, d) => c.Node == d.Id) .Where(a => templateIds.Contains(a.TrackTemplateId)) + .WhereIF(!input.KeyWord.IsNullOrWhiteSpace(), (a, b, c, d) => + b.Code.Contains(input.KeyWord!) + || b.EnContent.Contains(input.KeyWord!) + || b.Content.Contains(input.KeyWord!) + ) .Select((a, b, c, d) => new TemplateContentDtoVo { TemplateId = a.TrackTemplateId,