diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 27d3b05535..55648edcad 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -621,7 +621,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50 @@ -653,7 +653,7 @@ AND i.GRID_ID = #{orgId} - AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp GROUP BY categoryName 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 83332f7dfb..04b41b4180 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 @@ -407,7 +407,7 @@ FROM project p INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0) WHERE p.DEL_FLAG = 0 - AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') #{endDate} ORDER BY projectId @@ -478,7 +478,7 @@ COUNT(ID) AS count FROM project WHERE DEL_FLAG = '0' - AND ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate} AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') #{endDate}