From 6467a26062169c4c1c4546a6cc54f72a55abc1f9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 10 Oct 2022 09:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IssueServiceImpl.java |  9 +++++++++
 .../src/main/resources/mapper/IssueDao.xml       | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 9bc48a612d..be1021439d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1982,6 +1982,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             result.setList(allIssueListResultDTOS);
             result.setTotal(allIssueListResultDTOS.size());
         }
+        if (CollectionUtils.isNotEmpty(result.getList())){
+            result.getList().forEach(l -> {
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId());
+                if(null == gridInfo){
+                    throw new EpmetException("查询网格信息失败："+l.getGridId());
+                }
+                l.setGridName(gridInfo.getGridNamePath());
+            });
+        }
         return result;
     }
 }
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 06f323277a..effe000fe6 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
@@ -892,27 +892,27 @@
             vs.OPPOSITION_COUNT
         FROM issue i
         LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0'
-        WHERE DEL_FLAG = '0'
+        WHERE i.DEL_FLAG = '0'
         <if test='null != startTime and startTime != "" '>
-            AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startTime}
+            AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') >= #{startTime}
         </if>
         <if test='null != endTime and endTime != "" '>
-            AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+            AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test='null != issueStatus and issueStatus != "" '>
-            AND ISSUE_STATUS = #{issueStatus}
+            AND i.ISSUE_STATUS = #{issueStatus}
         </if>
         <if test='null != issueTitle and issueTitle != "" '>
-            AND ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%')
+            AND i.ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%')
         </if>
         <choose>
             <when test='orgType == "agency"'>
-                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+                AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
             </when>
             <otherwise>
-                AND GRID_ID = #{orgId}
+                AND i.GRID_ID = #{orgId}
             </otherwise>
         </choose>
-        ORDER BY CREATED_TIME DESC
+        ORDER BY i.CREATED_TIME DESC
     </select>
 </mapper>
\ No newline at end of file