From 4e334f28699b44a115ac1c40b45e972cc498a900 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Thu, 12 Sep 2024 16:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dtos/TrackContents/GetPageTrackContentInput.cs | 9 +++++++--
src/SJZY.Track.Application/Helpers/ForewarningHelper.cs | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
index 513b56bb..9a5693a3 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
@@ -1,4 +1,4 @@
-namespace SJZY.Track.Application.Contract.Dtos.TrackContents;
+namespace SJZY.Track.Application.Contract.Dtos.TrackContents;
public class GetPageTrackContentInput : PageInfoInput
{
@@ -9,7 +9,7 @@ public class GetPageTrackContentInput : PageInfoInput
///
/// 关键字
- ///
+ ///
public string? Keywords { get; set; }
///
@@ -65,6 +65,11 @@ public class GetTrackContentListDto
///
public string TrackFlag { get; set; }
+ ///
+ /// 是否对外
+ ///
+ public bool IsExternal { get; set; }
+
///
/// 创建时间
///
diff --git a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs
index 9755e1a9..cd12de06 100644
--- a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs
+++ b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs
@@ -179,6 +179,7 @@ public class ForewarningHelper
EndTrackStatusId = x.EndTrackStatusId,
EndTrackStatus = statusDic.TryGetValue(x.EndTrackStatusId, out var end) ? end : "",
NotifyUserIds = x.NotifyUserId.Split(',').Select(int.Parse).ToList(),
+ NotifyUsers = x.NotifyUser.Split(',').ToList(),
NotifyModes = x.NotifyMode.Split(',').Select(Enum.Parse).ToList(),
}).ToList(),
WarningFactors = warning.WarningFactors.Select(x => new WarningFactorWithIdDto