diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml index 7ecd695786..06f5af5e31 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml @@ -57,7 +57,7 @@ i.grid_id = #{gridId} ORDER BY - count DESC + count DESC, i.created_time DESC LIMIT #{pageNo}, #{pageSize} @@ -93,7 +93,7 @@ AND i.org_id_path like concat('%', #{agencyId}, '%') AND i.issue_status = 'closed' ORDER BY - count DESC + count DESC, i.closed_time DESC LIMIT #{pageNo}, #{pageSize} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index 9eb5fb0c7d..601b42aa66 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -146,7 +146,7 @@ public class IssueManageController { * @author wangc * @date 2020.05.15 00:19 **/ - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) + //@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) @PostMapping(value = "votingissuedetail") public Result votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){ ValidatorUtils.validateEntity(issueDetail);