From fc3604a84f703f7215b124286f2d8077eeb3d9ac Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 20 Apr 2022 18:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=88=BF=E5=B1=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/HouseController.java | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index 5ef535aa11..459d0f5eb6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -71,13 +71,26 @@ public class HouseController implements ResultDataResolver {
 
 
     @PostMapping("houselist")
-    public Result<PageData<IcHouseListResultDTO>> houseList(@RequestBody IcHouseListFormDTO formDTO) {
+    public Result<PageData<IcHouseListResultDTO>> houseList(@LoginUser TokenDto loginUser, @RequestBody IcHouseListFormDTO formDTO) {
         //效验数据
+        LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【查询房屋】查询当前staff所在组织信息失败");
+        formDTO.setAgencyId(loginUserDetail.getAgencyId());
         ValidatorUtils.validateEntity(formDTO);
         return new Result().ok(houseService.getHouseList(formDTO));
 
     }
 
+    public LoginUserDetailsResultDTO getLoginUserDetailsResultDTO(@LoginUser TokenDto loginUser, String errorMsg) {
+        LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
+        form.setUserId(loginUser.getUserId());
+        form.setClient(loginUser.getClient());
+        form.setApp(loginUser.getApp());
+        return getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER,
+                EpmetErrorCode.SERVER_ERROR.getCode(),
+                errorMsg,
+                null);
+    }
+
     /**
      * @return
      * @Description 社区查询-搜索房屋
@@ -105,14 +118,7 @@ public class HouseController implements ResultDataResolver {
             buildingName = null;
         }
 
-        LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
-        form.setUserId(loginUser.getUserId());
-        form.setClient(loginUser.getClient());
-        form.setApp(loginUser.getApp());
-        LoginUserDetailsResultDTO loginUserDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER,
-                EpmetErrorCode.SERVER_ERROR.getCode(),
-                "【社区查询-查询房屋】查询当前staff所在组织信息失败",
-                null);
+        LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【社区查询-查询房屋】查询当前staff所在组织信息失败");
         formDTO.setAgencyId(loginUserDetail.getAgencyId());
         formDTO.setBuildingName(buildingName);
         formDTO.setNeighborHoodName(neighborhoodName);