From 44944da978e9cccd566a58e8d3268faac6397e80 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 16 Jul 2021 10:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=93=E6=A1=88=E9=A1=B9=E7=9B=AE=E8=AE=AE=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8sql=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProjectDao.xml                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index a75b3514af..265ef3bcc6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/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>