bug修复˚

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);