Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -92,6 +92,9 @@ public class IcHouseListFormDTO extends PageFormDTO {
 
     private String customerId;
 
+    /**
+     * 是按照Id还是agencyId查询
+     */
     private String selectType;
 
     /**

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

@@ -368,8 +368,8 @@ public class HouseController implements ResultDataResolver {
         if (StringUtils.isBlank(formDTO.getAgencyId())) {
             LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败");
             formDTO.setAgencyId(loginUserDetail.getAgencyId());
-            formDTO.setSelectType("agency");
         }
+        formDTO.setSelectType("agency");
         ValidatorUtils.validateEntity(formDTO);
 
         ExcelWriter excelWriter = null;