From 950b3799103d4eaf5d2d04a3f0a238d75fc569df Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 4 Jan 2021 14:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=9D=83=E9=99=90=E3=80=81=E5=B1=85=E6=B0=91=E7=83=AD?=
 =?UTF-8?q?=E8=AE=AE=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/govissue/IssueDao.xml           | 4 ++--
 .../main/java/com/epmet/controller/IssueManageController.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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}
         </foreach>
         ORDER BY
-            count DESC
+            count DESC, i.created_time DESC
         LIMIT
             #{pageNo}, #{pageSize}
     </select>
@@ -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}
     </select>
 
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<GovIssueDetailResultDTO> votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){
         ValidatorUtils.validateEntity(issueDetail);