From 584c4a38dd4f590208eefeff8afc0bd671459e06 Mon Sep 17 00:00:00 2001 From: lin222 Date: Fri, 17 Jan 2025 15:20:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(doc-list):=20:bug:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=E4=B8=AD=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE=20/=20Fi?= =?UTF-8?q?x=20issue=20with=20displaying=20deleted=20data=20in=20API=20doc?= =?UTF-8?q?umentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/torna/service/DocInfoService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 670d8bcb..a60b4bae 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); -- Gitee