Fixed method getDocumentChildren to handle correctly archived documents

logicaldoc · Feb 7, 2025 · 192478a · 192478a
1 parent 973d9fa
commit 192478a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/logicaldoc-webdav/build.xml b/logicaldoc-webdav/build.xml
@@ -68,7 +68,7 @@
 						<include name="**/Rest*.class" />
 						<include name="**/context-webservice.xml" />
 						-->
-						<include name="**/*.class" />
+						<include name="**/ResourceServiceImpl*.class" />
 					</fileset>
 				</copy>
 			</sequential>

diff --git a/...ldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/service/ResourceServiceImpl.java b/...ldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/service/ResourceServiceImpl.java
@@ -5,7 +5,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -185,9 +184,10 @@ public List<Resource> getChildResources(Resource parentResource) throws DavExcep
 
 	private void getDocumentChildren(Resource parentResource, List<Resource> resourceList, User user)
 			throws PersistenceException {
-		Collection<Document> documents = documentDAO.findByFolder(Long.parseLong(parentResource.getID()), null);
-		for (Iterator<Document> iterator = documents.iterator(); iterator.hasNext();) {
-			Document document = iterator.next();
+
+		Collection<Document> documents = documentDAO.findByFileNameAndParentFolderId(
+				Long.parseLong(parentResource.getID()), "", null, user.getTenantId(), null);
+		for (Document document : documents) {
 			try {
 				checkPublished(user, document);
 			} catch (Exception t) {