Merge branch 'refs/heads/abp' into digital-collectibles

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussAggregateRoot.cs

@@ -67,6 +67,9 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum
         [SugarColumn(IsJson = true)]//使用json处理
         public List<Guid>? PermissionUserIds { get; set; }
 
+        [SugarColumn(IsJson = true)]//使用json处理
+        public HashSet<Guid>? DiscussLables{ get; set; }
+        
         /// <summary>
         /// 是否禁止评论创建功能
         /// </summary>

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussLableAggregateRoot.cs

@@ -4,17 +4,13 @@ using Volo.Abp.Domain.Entities;
 
 namespace Yi.Framework.Bbs.Domain.Entities.Forum
 {
-    [SugarTable("MyType")]
-    public class MyTypeEntity : Entity<Guid>, ISoftDelete
+    [SugarTable("DiscussLable")]
+    public class DiscussLableAggregateRoot : AggregateRoot<Guid>, ISoftDelete
     {
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
-        public override Guid Id { get; protected set; }
         public bool IsDeleted { get; set; }
 
         public string Name { get; set; }
         public string? Color { get; set; }
         public string? BackgroundColor { get; set; }
-
-        public Guid UserId { get; set; }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussMyTypeEntity.cs

@@ -1,16 +0,0 @@
-using SqlSugar;
-using Volo.Abp.Domain.Entities;
-
-namespace Yi.Framework.Bbs.Domain.Entities.Forum
-{
-    [SugarTable("DiscussMyType")]
-    public class DiscussMyTypeEntity : Entity<Guid>
-    {
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
-        public override Guid Id { get; protected set; }
-
-        public Guid DiscussId { get; set; }
-
-        public Guid MyTypeId { get; set; }
-    }
-}

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs

@@ -1,8 +1,10 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Domain.Services;
+using Volo.Abp.Users;
 using Yi.Framework.Bbs.Domain.Entities.Forum;
 using Yi.Framework.Bbs.Domain.Managers.ArticleImport;
+using Yi.Framework.Bbs.Domain.Shared.Consts;
 using Yi.Framework.Bbs.Domain.Shared.Enums;
 using Yi.Framework.Bbs.Domain.Shared.Model;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -44,6 +46,38 @@ namespace Yi.Framework.Bbs.Domain.Managers
             return await _commentRepository.InsertReturnEntityAsync(entity);
         }
 
+        /// <summary>
+        /// 校验主题查询权限
+        /// </summary>
+        /// <param name="discussId"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        public async Task VerifyDiscussPermissionAsync(Guid discussId,Guid? userId)
+        {
+            var discuss = await _discussRepository.GetFirstAsync(x => x.Id == discussId);
+            if (discuss is null)
+            {
+                throw new UserFriendlyException(DiscussConst.No_Exist);
+            }
+
+            if (discuss.PermissionType == DiscussPermissionTypeEnum.Oneself)
+            {
+                if (discuss.CreatorId != userId)
+                {
+                    throw new UserFriendlyException(DiscussConst.Privacy);
+                }
+            }
+
+            if (discuss.PermissionType == DiscussPermissionTypeEnum.User)
+            {
+                if (discuss.CreatorId !=userId &&
+                    !discuss.PermissionUserIds.Contains(userId?? Guid.Empty))
+                {
+                    throw new UserFriendlyException(DiscussConst.Privacy);
+                }
+            }
+        }
+        
         /// <summary>
         /// 导入文章
         /// </summary>