Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(超算专区): 修复专区栏目需要删除两次才能删除的问题

This commit is contained in:
otto 2026-06-18 14:24:08 +08:00
parent 5aa499f4de
commit 7a44a2113d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java
View File

@ -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())) {