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 e01a45275c..19e082d341 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 @@ -578,14 +578,30 @@ t.* FROM (SELECT - DISTINCT pp.PROJECT_ID, - pp.INTERNAL_REMARK, - pp.PUBLIC_REPLY AS projectScheme - FROM project_process pp - WHERE DEL_FLAG = '0' - AND pp.STAFF_ID = #{userId} - AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId}) - ORDER BY pp.CREATED_TIME DESC) t + DISTINCT t.PROJECT_ID, + t.INTERNAL_REMARK, + t.projectScheme + FROM ( + (SELECT + DISTINCT pp.PROJECT_ID, + pp.INTERNAL_REMARK, + pp.PUBLIC_REPLY AS projectScheme + FROM project_process pp + WHERE DEL_FLAG = '0' + AND pp.STAFF_ID = #{userId} + AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId}) + ORDER BY pp.CREATED_TIME DESC) + UNION ALL + (SELECT + DISTINCT ps.PROJECT_ID , + pp.INTERNAL_REMARK, + pp.PUBLIC_REPLY AS projectScheme + FROM project_staff ps + INNER JOIN project_process pp ON pp.PROJECT_ID = ps.PROJECT_ID AND pp.DEL_FLAG = '0' + WHERE ps.DEL_FLAG = '0' + AND ps.ORG_ID_PATH LIKE CONCAT('%',#{agencyId}) + AND ps.STAFF_ID = #{userId} + ORDER BY pp.CREATED_TIME DESC) )t)t INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0' LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0' WHERE 1=1