From dae772dd172a49daf59cd58f6de8b38d6af6c829 Mon Sep 17 00:00:00 2001
From: wizardchen <wizardchen@tencent.com>
Date: Wed, 14 Jan 2026 15:44:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A1=AE=E4=BF=9D"=E6=9C=AA=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB"=E6=A0=87=E7=AD=BE=E6=8E=92=E5=9C=A8=E6=9C=80?=
 =?UTF-8?q?=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/application/repository/tag.go    | 2 +-
 internal/application/service/knowledge.go | 7 ++++++-
 internal/application/service/tag.go       | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/internal/application/repository/tag.go b/internal/application/repository/tag.go
index 907ab8bc..c90a59db 100644
--- a/internal/application/repository/tag.go
+++ b/internal/application/repository/tag.go
@@ -122,7 +122,7 @@ func (r *knowledgeTagRepository) ListByKB(
 
 	var tags []*types.KnowledgeTag
 	if err := dataQuery.
-		Order("sort_order ASC, created_at ASC").
+		Order("sort_order ASC, created_at DESC").
 		Offset(page.Offset()).
 		Limit(page.Limit()).
 		Find(&tags).Error; err != nil {
diff --git a/internal/application/service/knowledge.go b/internal/application/service/knowledge.go
index 3bee9cc6..0ec7fbc6 100644
--- a/internal/application/service/knowledge.go
+++ b/internal/application/service/knowledge.go
@@ -7034,13 +7034,18 @@ func (s *knowledgeService) getOrCreateTagInTarget(
 	}
 
 	// Create new tag in target KB
+	// "未分类" tag should have the lowest sort order to appear first
+	sortOrder := srcTag.SortOrder
+	if srcTag.Name == types.UntaggedTagName {
+		sortOrder = -1
+	}
 	newTag := &types.KnowledgeTag{
 		ID:              uuid.New().String(),
 		TenantID:        dstTenantID,
 		KnowledgeBaseID: dstKnowledgeBaseID,
 		Name:            srcTag.Name,
 		Color:           srcTag.Color,
-		SortOrder:       srcTag.SortOrder,
+		SortOrder:       sortOrder,
 		CreatedAt:       time.Now(),
 		UpdatedAt:       time.Now(),
 	}
diff --git a/internal/application/service/tag.go b/internal/application/service/tag.go
index 5cf60543..e7fcfdbe 100644
--- a/internal/application/service/tag.go
+++ b/internal/application/service/tag.go
@@ -123,6 +123,10 @@ func (s *knowledgeTagService) CreateTag(
 	}
 
 	now := time.Now()
+	// "未分类" tag should have the lowest sort order to appear first
+	if name == types.UntaggedTagName {
+		sortOrder = -1
+	}
 	tag := &types.KnowledgeTag{
 		ID:              uuid.New().String(),
 		TenantID:        kb.TenantID,