Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -37,6 +37,7 @@ import com.epmet.service.HouseService;
 import com.epmet.service.IcBuildingService;
 import com.epmet.service.IcBuildingUnitService;
 import com.epmet.service.IcHouseService;
+import com.epmet.service.*;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private IcHouseRedis icHouseRedis;
+    @Autowired
+    private AgencyService agencyservice;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -234,11 +238,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         //IPage<Map<String, Object>> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
 
         // 查询pids
-        CustomerAgencyDTO agency = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(ancestorAgencyId), ServiceConstant.GOV_ORG_SERVER,
+        CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId);
-                EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询需求列表】查询当前staff所属组织信息失败", null);
 
         if (agency == null) {
-            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询需求列表】查询当前staff所属组织信息失败");
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败");
         }
 
         String pids;