From 8c2bfd8297a5410fd72d2eecf8d10f281e2ae2c6 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 10 Feb 2021 15:57:13 +0900
Subject: [PATCH] Fix #1611 query error in declared document/comment list page

---
 modules/comment/queries/getDeclaredLatest.xml  | 5 ++++-
 modules/document/queries/getDeclaredLatest.xml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/comment/queries/getDeclaredLatest.xml b/modules/comment/queries/getDeclaredLatest.xml
index 99e4334d2..5d12df41b 100644
--- a/modules/comment/queries/getDeclaredLatest.xml
+++ b/modules/comment/queries/getDeclaredLatest.xml
@@ -4,7 +4,7 @@
 		<table name="comment_declared" />
         <table name="comment_declared_log" />
     </tables>
-    <columns distinct="distinct">
+    <columns>
         <column name="comment_declared_log.comment_srl" />
 		<column name="count(*)" alias="declared_count" />
 		<column name="max(comment_declared_log.regdate)" alias="latest_declared" />
@@ -15,6 +15,9 @@
 		<condition operation="more" column="comment_declared.declared_count" default="1" pipe="and" />
         <condition operation="in" column="comment_declared_log.comment_srl" var="comment_srls" pipe="and" />
     </conditions>
+    <groups>
+        <group column="comment_declared_log.comment_srl" />
+    </groups>
     <navigation>
         <index var="sort_index" default="latest_declared" order="order_type" />
         <list_count var="list_count" default="20" />
diff --git a/modules/document/queries/getDeclaredLatest.xml b/modules/document/queries/getDeclaredLatest.xml
index bf13c44bc..0b5d84b65 100644
--- a/modules/document/queries/getDeclaredLatest.xml
+++ b/modules/document/queries/getDeclaredLatest.xml
@@ -4,7 +4,7 @@
 		<table name="document_declared" />
         <table name="document_declared_log" />
     </tables>
-    <columns distinct="distinct">
+    <columns>
         <column name="document_declared_log.document_srl" />
 		<column name="count(*)" alias="declared_count" />
 		<column name="max(document_declared_log.regdate)" alias="latest_declared" />
@@ -15,6 +15,9 @@
 		<condition operation="more" column="document_declared.declared_count" default="1" pipe="and" />
         <condition operation="in" column="document_declared_log.document_srl" var="document_srls" pipe="and" />
     </conditions>
+    <groups>
+        <group column="document_declared_log.document_srl" />
+    </groups>
     <navigation>
         <index var="sort_index" default="latest_declared" order="order_type" />
         <list_count var="list_count" default="20" />