Merge branch 'dev'

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -155,18 +155,22 @@
     </select>
 
     <select id="selectClosedProjectList" resultType="com.epmet.dto.result.LatestListResultDTO">
-        SELECT
+        SELECT DISTINCT
             p.id AS "projectId",
             pro.public_reply AS "publicReply",
             pro.department_name AS "departmentName",
             UNIX_TIMESTAMP(pro.created_time) AS "closeProjectTime"
         FROM project p
         INNER JOIN project_process pro ON p.id = pro.project_id
+        INNER JOIN project_related_personnel prp ON p.id = prp.project_id
         WHERE p.del_flag = '0'
         AND pro.del_flag = '0'
         AND p.customer_id = #{customerId}
         AND p.`status` = 'closed'
         AND pro.operation = 'close'
+        AND p.origin = 'issue'
+        AND prp.source_type = 'issue'
+        AND prp.grid_id = #{gridId}
         ORDER BY pro.created_time DESC
         LIMIT #{num}, #{pageSize}
     </select>