From 7a44a2113d25ba737e3f822e5471a5354e2b5e23 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Thu, 18 Jun 2026 14:24:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E5=8C=BA=E6=A0=8F=E7=9B=AE=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=88=A0=E9=99=A4=E4=B8=A4=E6=AC=A1=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/doc/service/impl/CmsDocServiceImpl.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java
index eb95c3275..b0efdff90 100644
--- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java
+++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java
@@ -1504,9 +1504,13 @@ public class CmsDocServiceImpl implements ICmsDocService {
         cmsAsyncService.updateCmsPublishDataByGitLink(cmsProject, cmsDoc, branchName);
     }
 
-    private int deleteCmsDir(CmsDoc cmsDir) {
+    private int deleteCmsDir(CmsProject cmsProject, CmsDoc cmsDir) {
         if (!isNoAuditRequired(cmsDir.getDeptId()) || tokenService.hasDeptPerms(cmsDir.getDeptId(), UserConstants.CMS_PERMS_DOCS_AUDIT)) {
-            return cmsDocMapper.deleteCmsDocById(cmsDir.getId());
+            boolean deleteResult = cmsAsyncService.deleteCmsDocForGitLink(cmsDir, cmsProject, CmsConstants.BRANCH_MASTER);
+            if (deleteResult) {
+                return cmsDocMapper.deleteCmsDocById(cmsDir.getId());
+            }
+            throw new ServiceException("栏目删除失败");
         }
         throw new ServiceException("无权限删除栏目");
     }
@@ -1518,11 +1522,11 @@ public class CmsDocServiceImpl implements ICmsDocService {
             throw new ServiceException("该文章不存在(文章Id[" + id + "])");
         }
         checkCmsLockStatus(cmsDoc.getDeptId());
-        if (cmsDoc.getIsDir()) {
-            return deleteCmsDir(cmsDoc);
-        }
         //2、获取专区项目
         CmsProject cmsProject = cmsProjectService.selectCmsProjectByDeptId(cmsDoc.getDeptId());
+        if (cmsDoc.getIsDir()) {
+            return deleteCmsDir(cmsProject, cmsDoc);
+        }
 
         //删除待审核、审核未通过文章——删除临时分支，拒绝合并请求
         if (DocAuditStatus.TO_BE_AUDIT.getAuditCode().equals(cmsDoc.getAuditStatus())) {