فهرست منبع

Merge branch 'test' into lib/test

libin 22 ساعت پیش
والد
کامیت
4ccba71799
2فایلهای تغییر یافته به همراه7 افزوده شده و 1 حذف شده
  1. 2 1
      src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs
  2. 5 0
      src/Hotline.Share/Dtos/Snapshot/PointsDto.cs

+ 2 - 1
src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -1123,10 +1123,11 @@ public abstract class SnapshotApplicationBase
                 .LeftJoin<Notification>((receiver, notify) => notify.Id == receiver.NotificationId)
                 .LeftJoin<SnapshotBulletin>((receiver, notify, bulletin) => bulletin.Id == notify.ExternalId)
                 .Where((receiver, notify, bulletin) => bulletin.Shape == EBulletinShape.Message)
-                .GroupBy((receiver, notify, bulletin) => new { notify.ExternalId, notify.Title})
+                .GroupBy((receiver, notify, bulletin) => new { notify.Id, notify.ExternalId, notify.Title})
                 .Select((receiver, notify, bulletin) => new PointsBulletinItemsOutDto
                 {
                     BulletinId = notify.ExternalId,
+                    NotificationId = notify.Id,
                     Title = notify.Title,
                 }, true)
                 .Take(2)

+ 5 - 0
src/Hotline.Share/Dtos/Snapshot/PointsDto.cs

@@ -147,6 +147,11 @@ public class PointsBulletinItemsOutDto
     /// </summary>
     public string BulletinId { get; set; }
 
+    /// <summary>
+    /// 通知Id
+    /// </summary>
+    public string NotificationId { get; set; }
+
     /// <summary>
     /// 标题
     /// </summary>