Merge branch 'master' of https://github.com/logicaldoc/community.git

logicaldoc · Jan 8, 2025 · 0150615 · 0150615
2 parents 280259c + 234d0ae
commit 0150615
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java
@@ -59,7 +59,7 @@ private void updateLastNote(Document doccument, DocumentNote note) {
 					dao.initialize(document);
 
 					String lastNoteMessage = dao.queryForList(
-							"select ld_message from ld_note where ld_page=0 and ld_id=:id order by ld_date desc",
+							"select ld_message from ld_note where ld_page=0 and ld_deleted=0 and ld_id=:id order by ld_date desc",
 							Map.of("id", note.getDocId()), String.class, null).stream().findFirst()
 							.orElse(note.getMessage());
 

diff --git a/...aldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIIncrementalArchive.java b/...aldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIIncrementalArchive.java
@@ -27,8 +27,6 @@ public class GUIIncrementalArchive implements Serializable {
 
 	private List<GUITemplate> templates = new ArrayList<>();
 
-	private Long aosManagerId;
-
 	public GUIIncrementalArchive() {
 		folder = new GUIFolder();
 		folder.setId(5);
@@ -86,12 +84,4 @@ public void setId(long id) {
 	public List<Long> getTemplateIds() {
 		return templates.stream().map(t -> t.getId()).collect(Collectors.toList());
 	}
-
-	public Long getAosManagerId() {
-		return aosManagerId;
-	}
-
-	public void setAosManagerId(Long aosManagerId) {
-		this.aosManagerId = aosManagerId;
-	}
 }