From b1ac7b1fde0338c773d7e76a12185486c562238f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 17 Nov 2020 14:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 6816c22412..dbdfc2f200 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1471,7 +1471,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 new OrgInfoFormDTO(OrgInfoConstant.GRID,result.stream().map(ParticipatedTopicUnitResultDTO :: getTopicReleaseGridName).distinct().collect(Collectors.toList())));
         if(gridR.success() && !CollectionUtils.isEmpty(gridR.getData())){
             return result.stream().flatMap(topic -> gridR.getData().stream() .filter(grid -> StringUtils.equals(grid.getOrgId(),topic.getTopicReleaseGridName())).map(orgInfo -> {
-                topic.setTopicReleaseGridName(orgInfo.getOrgId());
+                topic.setTopicReleaseGridName(orgInfo.getOrgName());
                 return topic;
             })).collect(Collectors.toList());
         } return Collections.EMPTY_LIST;