diff --git a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java index 670d8bcb9e86827d0d5df340711d705933df6987..a60b4baeea5cd88822a31360d3da917119fc7673 100755 --- a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java +++ b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java @@ -230,7 +230,9 @@ public class DocInfoService extends BaseLambdaService { DocInfo::getOrderIndex, DocInfo::getIsShow, DocInfo::getIsLocked, DocInfo::getStatus) .eq(DocInfo::getModuleId, docListFormDTO.getModuleId()) .eq(docListFormDTO.getStatus() != null, DocInfo::getStatus, docListFormDTO.getStatus()) - .orLambda(q -> q.eq(DocInfo::getModuleId, docListFormDTO.getModuleId()).eq(DocInfo::getIsFolder, Booleans.TRUE)); + .eq(DocInfo::getIsDeleted, Booleans.FALSE) + .orLambda(q -> q.eq(DocInfo::getModuleId, docListFormDTO.getModuleId()) + .eq(DocInfo::getIsFolder, Booleans.TRUE).eq(DocInfo::getIsDeleted, Booleans.FALSE)); } List docInfoList = this.list(query); sortDocInfo(docInfoList);