From a3e1eb9e68cb73df308504144c291e6cc3e406be Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 9 Jun 2020 16:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3-=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E5=8F=91=E5=B8=83=E5=8D=95=E4=BD=8D-=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=8C=87=E5=AF=BC=E5=91=98=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E4=B9=89=E7=9A=84=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerAgencyServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 52e15fcbd9..298b467b89 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -771,11 +771,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
         //4:根据不同角色查询不同数据
         CustomerAgencyEntity agencyEntity = baseDao.selectById(staffAgencyDTO.getAgencyId());
-        //当前机关信息
-        returnDTO.setAgencyId(agencyEntity.getId());
-        returnDTO.setAgencyName(agencyEntity.getOrganizationName());
         if (party) {
             //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
+            //当前机关信息
+            returnDTO.setAgencyId(agencyEntity.getId());
+            returnDTO.setAgencyName(agencyEntity.getOrganizationName());
             //当前机关下部门列表信息
             List<AgencyDeptList> agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId());
             returnDTO.setAgencyDeptList(agencyDeptList);