From d95bcb70c029421e5ec65c9a81090fcac0305f8b Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Mon, 22 Apr 2024 14:42:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=BD=A8=E8=BF=B9=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?code=E6=A8=A1=E7=B3=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/TrackFlags/GetTrackFlagListDto.cs             | 10 +++++-----
 .../Dtos/TrackFlags/GetPageTrackFlagVO.cs              |  8 ++++----
 .../Repositories/TrackFlagRepository.cs                |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs
index 3964caea..505536e1 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs
@@ -58,11 +58,11 @@
         /// <summary>
         /// 选中的轨迹标记id
         /// </summary>
-        public List<int>? SelectIds {  get; set; }
+        public List<int>? SelectIds { get; set; }
 
-        ///// <summary>
-        ///// 关键字
-        ///// </summary>
-        //public string Keywords { get; set; }
+        /// <summary>
+        /// 关键字
+        /// </summary>
+        public string? Keywords { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs
index adbf1a5d..f838b37d 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs
@@ -18,10 +18,10 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags
         /// </summary>
         public List<int>? SelectIds { get; set; }
 
-        ///// <summary>
-        ///// 关键字
-        ///// </summary>
-        //public string Keywords { get; set; }
+        /// <summary>
+        /// 关键字
+        /// </summary>
+        public string? Keywords { get; set; }
     }
 
     public class GetTrackFlagListVO
diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs
index d2227924..ed92d283 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs
@@ -46,8 +46,9 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
             .LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false)
             .LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false)
             .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId)
+            .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b, c, d) => SqlFunc.Contains(a.Code, input.Keywords))
             .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc)
-            .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
+            .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds!.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
             .Select((a, b, c, d) => new GetTrackFlagListVO
             {
                 Id = a.Id,