From 19a96955f5f946daa302a7f7aa50189a8fc916ea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 20 Aug 2021 14:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=92=8C=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=B5=8B=E5=80=BCtowOrgName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmetmessage/impl/EpmetMessageServiceImpl.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
index c035e0562d..49f53f0bfa 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
@@ -139,8 +139,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
                     staffInfo.setStaffName(staffInfoCache.getRealName());
                     staffInfo.setGender(staffInfoCache.getGender().toString());
                     staffInfo.setHeadPhoto(StringUtils.isNotBlank(staffInfoCache.getHeadPhoto()) ? staffInfoCache.getHeadPhoto() : StrConstant.EPMETY_STR);
-                    //todo
-                    staffInfo.setOrgName("todo get");
+                    staffInfo.setOrgName(staffInfoCache.getTwoOrgName());
                     resDTO.getStaffList().add(staffInfo);
                 }
             }
@@ -168,8 +167,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
             detail.setStaffName(staffInfoCache.getRealName());
             detail.setGender(staffInfoCache.getGender().toString());
             detail.setHeadPhoto(StringUtils.isNotBlank(staffInfoCache.getHeadPhoto()) ? staffInfoCache.getHeadPhoto() : StrConstant.EPMETY_STR);
-            //todo
-            detail.setOrgName("todo get");
+            detail.setOrgName(staffInfoCache.getTwoOrgName());
         }
         result.setDataList(data.getList());
         return result;