From 8fa19b3190e2aba8093028b3c9eb7691f9d7568f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Fri, 5 Jan 2024 10:47:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs | 5 +++++
.../Managers/ArticleImport/AbstractArticleImport.cs | 3 +++
.../Managers/ArticleImport/VuePressArticleImport.cs | 1 -
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs
index 21652fc6..a46c8cb4 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs
@@ -33,6 +33,11 @@ namespace Yi.Framework.Bbs.Domain.Entities
public Guid? LastModifierId { get; set; }
public DateTime? LastModificationTime { get; set; }
+
+ ///
+ /// 排序
+ ///
+ public int OrderNum { get; set; } = 0;
}
public static class ArticleEntityExtensions
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs
index 48d497bc..85de471d 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Yi.Framework.Bbs.Domain.Entities;
using Yi.Framework.Bbs.Domain.Shared.Model;
+using Yi.Framework.Core.Data;
namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport
{
@@ -19,10 +20,12 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport
public virtual List Import(Guid discussId, Guid articleParentId, List fileObjs)
{
var articles = Convert(fileObjs);
+ var orderNum = 0;
articles.ForEach(article =>
{
article.DiscussId = discussId;
article.ParentId = articleParentId;
+ article.OrderNum = ++orderNum;
});
return articles;
}
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs
index 6942fcff..e6186748 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs
@@ -65,7 +65,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport
f.Content = result;
return f;
});
-
var output = fileContentHandler.Select(x => new ArticleEntity() { Content = x.Content, Name = x.FileName }).ToList();
return output;