Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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

@@ -424,8 +424,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     public PageData<PartyCenterHouseResultDTO> queryPartyCenterHouseList(PartyCenterHousePageFormDTO formDTO) {
         CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
         PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
-        List<PartyCenterHouseResultDTO> list=baseDao.selectListPartyCenterHouse(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId(),
+        List<PartyCenterHouseResultDTO> list=baseDao.selectListPartyCenterHouse(formDTO.getCustomerId(),
-                formDTO.getNeighborHoodName(),formDTO.getBuildingName(),formDTO.getBuildingId(),formDTO.getPartyCenterHouseFlag());
+                staffInfoCacheResult.getAgencyId(),
+                formDTO.getNeighborHoodName(),
+                formDTO.getBuildingName(),
+                formDTO.getBuildingId(),
+                formDTO.getPartyCenterHouseFlag());
         list.forEach(item -> {
             item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType()));
             item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose()));