From ee5ecdf20d46a143a1432163e8ad159e8f12ebfa Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 8 Jun 2022 18:37:09 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=CB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/HouseServiceImpl.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 7267860432..ada020d72c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -275,15 +275,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     @Override
     public PageData<IcHouseListResultDTO> getHouseList(IcHouseListFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getAgencyId())){
-            formDTO.setAgencyId(formDTO.getId());
-        }
         // 查询pids
         String pids = null;
-        if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
-            pids = getPids(formDTO.getAgencyId());
-        }
         if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){
+            if (StringUtils.isBlank(formDTO.getAgencyId())){
+                formDTO.setAgencyId(formDTO.getId());
+            }
+        }
+        if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
             pids = getPids(formDTO.getAgencyId());
         }
         formDTO.setPids(pids);