Merge branch 'dev_0608fix'

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java

@@ -91,4 +91,6 @@ public class IcHouseListFormDTO extends PageFormDTO {
     private String updateEndDate;
     
     private String customerId;
+
+    private String selectType;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -113,6 +113,7 @@ public class HouseController implements ResultDataResolver {
         LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【查询房屋】查询当前staff所在组织信息失败");
         formDTO.setAgencyId(loginUserDetail.getAgencyId());
         ValidatorUtils.validateEntity(formDTO);
+        formDTO.setSelectType("id");
         return new Result().ok(houseService.getHouseList(formDTO));
 
     }
@@ -159,6 +160,7 @@ public class HouseController implements ResultDataResolver {
         formDTO.setAgencyId(loginUserDetail.getAgencyId());
         formDTO.setBuildingName(buildingName);
         formDTO.setNeighborHoodName(neighborhoodName);
+        formDTO.setSelectType("agency");
         return new Result<PageData<IcHouseListResultDTO>>().ok(houseService.getHouseList(formDTO));
     }
 
@@ -367,6 +369,7 @@ public class HouseController implements ResultDataResolver {
         if (StringUtils.isBlank(formDTO.getAgencyId())) {
             LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败");
             formDTO.setAgencyId(loginUserDetail.getAgencyId());
+            formDTO.setSelectType("agency");
         }
         ValidatorUtils.validateEntity(formDTO);
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -314,14 +314,16 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     @Override
     public PageData<IcHouseListResultDTO> getHouseList(IcHouseListFormDTO formDTO) {
-
         // 查询pids
         String pids = null;
-        if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
+        if (StringUtils.isNotBlank(formDTO.getSelectType()) && formDTO.getSelectType().equals("agency")){
-            pids = getPids(formDTO.getAgencyId());
+            if (StringUtils.isNotBlank(formDTO.getAgencyId())){
-        }
+                pids = getPids(formDTO.getAgencyId());
-        if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())) {
+            }
-            pids = getPids(formDTO.getAgencyId());
+        }else if (StringUtils.isNotBlank(formDTO.getSelectType()) && formDTO.getSelectType().equals("id")){
+            if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){
+                pids = getPids(formDTO.getId());
+            }
         }
         formDTO.setPids(pids);
         PageInfo<IcHouseListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())