From 3f4e0b4aa0f171ab7fc842ba940bc2c843a86f2c Mon Sep 17 00:00:00 2001
From: DaGou12138 <991623169@qq.com>
Date: Thu, 11 Jun 2026 17:17:59 +0800
Subject: [PATCH] =?UTF-8?q?#3212=20fix=EF=BC=9A=201.=E4=BF=AE=E5=A4=8DRAGF?=
 =?UTF-8?q?low=E8=BF=9E=E6=8E=A5=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DRAGFlow=E8=8E=B7=E5=8F=96=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98=203.=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=B8=8D=E5=86=8D=E5=88=A0=E9=99=A4=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=BD=B1=E5=AD=90=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E4=BA=A7=E7=94=9FRAGFlow=E7=AB=AF=E5=AD=A4=E5=84=BF?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=204.=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knowledge/rag/impl/RAGFlowAdapter.java        | 15 +++++----------
 .../service/impl/KnowledgeBaseServiceImpl.java    |  4 ++--
 .../service/impl/KnowledgeFilesServiceImpl.java   |  3 ++-
 main/manager-web/src/views/KnowledgeBaseItem.vue  |  4 ++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
index 13a6decf..f66623f7 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
@@ -485,16 +485,11 @@ public class RAGFlowAdapter extends KnowledgeBaseAdapter {
 
     @Override
     public Integer getDocumentCount(String datasetId) {
-        try {
-            DatasetDTO.InfoVO info = getDatasetInfo(datasetId);
-            if (info != null && info.getDocumentCount() != null) {
-                return info.getDocumentCount().intValue();
-            }
-            return 0;
-        } catch (Exception e) {
-            log.warn("获取文档数量失败: {}", e.getMessage());
-            return 0;
+        DatasetDTO.InfoVO info = getDatasetInfo(datasetId);
+        if (info != null && info.getDocumentCount() != null) {
+            return info.getDocumentCount().intValue();
         }
+        return 0;
     }
 
     @Override
@@ -518,7 +513,7 @@ public class RAGFlowAdapter extends KnowledgeBaseAdapter {
             return null;
         } catch (Exception e) {
             log.warn("获取数据集信息失败: datasetId={}, error={}", datasetId, e.getMessage());
-            return null;
+            throw convertToRenException(e);
         }
     }
 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
index 94958bd1..4c1ecdb8 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
@@ -100,9 +100,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
             }
 
             DatasetDTO.InfoVO datasetInfo = adapter.getDatasetInfo(dto.getDatasetId());
-
+            // getDatasetInfo 正常返回 null 表示远端确实不存在；异常时已抛出 RenException 由外层 catch 接管
             if (datasetInfo == null) {
-                // RAGFlow 端已删除 → 本地级联清理
+                // RAGFlow 端已确认删除 → 本地级联清理
                 log.info("数据集 {} 在 RAGFlow 端不存在，执行本地清理", dto.getDatasetId());
                 cleanupLocalDataset(dto.getDatasetId(), dto.getId());
                 // 标记为已删除，让上层从列表中移除
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
index 680abd6a..61d1c50e 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
@@ -529,7 +529,8 @@ public class KnowledgeFilesServiceImpl extends BaseServiceImpl<DocumentDao, Docu
             adapter.deleteDocument(datasetId, req);
             log.info("远程批量删除请求成功");
         } catch (Exception e) {
-            log.warn("远程删除请求部分或全部失败: {}", e.getMessage());
+            log.error("远程删除请求失败，中止本地清理以避免数据不一致: {}", e.getMessage());
+            throw new RenException(e.getMessage());
         }
 
         // 4. 原子化清理本地影子记录并同步统计数据
diff --git a/main/manager-web/src/views/KnowledgeBaseItem.vue b/main/manager-web/src/views/KnowledgeBaseItem.vue
index ed7d7cf3..14eae192 100644
--- a/main/manager-web/src/views/KnowledgeBaseItem.vue
+++ b/main/manager-web/src/views/KnowledgeBaseItem.vue
@@ -217,9 +217,9 @@ export default {
           } else {
             this.$message.error(res.data?.msg || this.$t('knowledgeFileUpload.deleteFailed'));
           }
-        }, () => {
+        }, (err) => {
           this.$set(this.deleteLoadingMap, doc.id, false);
-          this.$message.error(this.$t('knowledgeFileUpload.deleteFailed'));
+          this.$message.error(err?.data?.msg ||this.$t('knowledgeFileUpload.deleteFailed'));
         });
       }).catch(() => {});
     },