From 76e1721d70fc81dae8a2e7f69a15a166d359701b Mon Sep 17 00:00:00 2001
From: DarkSky <darksky2048@gmail.com>
Date: Thu, 15 Jan 2026 00:55:35 +0800
Subject: [PATCH] fix: journal conflict handle

---
 .../pages/workspace/detail-page/tabs/journal/index.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx
index 48737029e2..23e1ccff8a 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx
@@ -442,7 +442,7 @@ const ConflictList = ({
   ...attrs
 }: ConflictListProps) => {
   const t = useI18n();
-  const currentDoc = useService(DocService).doc;
+  const currentDocId = useServiceOptional(DocService)?.doc.id;
   const journalService = useService(JournalService);
   const { openConfirmModal } = useConfirmModal();
 
@@ -479,7 +479,7 @@ const ConflictList = ({
       {...attrs}
     >
       {docRecords.map(docRecord => {
-        const isCurrent = docRecord.id === currentDoc.id;
+        const isCurrent = currentDocId ? docRecord.id === currentDocId : false;
         return (
           <PageItem
             aria-selected={isCurrent}