bug#2768:user,gov-org

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -524,7 +524,7 @@ public interface GovOrgOpenFeignClient {
      * @date 2021/11/3 3:30 下午
      */
     @PostMapping("/gov/org/ichouse/selecthouseinfobyidcard")
-    Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard);
+    Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard,@RequestParam("customerId")String customerId);
 
     @GetMapping("/gov/org/ichouse/{id}")
     Result<IcHouseDTO> get(@PathVariable("id") String id);

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -311,8 +311,8 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result<List<String>> selectHouseInfoByIdCard(String idCard) {
+    public Result<List<String>> selectHouseInfoByIdCard(String idCard,String customerId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard, customerId);
     }
 
     @Override

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

@@ -98,8 +98,8 @@ public class IcHouseController {
      * @date 2021/11/3 3:30 下午
      */
     @PostMapping("selecthouseinfobyidcard")
-    public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard){
+    public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard,@RequestParam("customerId")String customerId){
-        return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
+        return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard,customerId));
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -52,7 +52,7 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @author zxc
      * @date 2021/11/3 3:30 下午
      */
-    List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
+    List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard,@Param("customerId")String customerId);
 
     Integer checkDoorNameUq(@Param("neighborHoodId") String neighborHoodId,
                             @Param("buildingId")String buildingId,

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

@@ -96,7 +96,7 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @author zxc
      * @date 2021/11/3 3:30 下午
      */
-    List<String> selectHouseInfoByIdCard(String idCard);
+    List<String> selectHouseInfoByIdCard(String idCard,String customerId);
 
     /**
      * @Description 楼栋下房屋列表

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

@@ -137,8 +137,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      * @date 2021/11/3 3:30 下午
      */
     @Override
-    public List<String> selectHouseInfoByIdCard(String idCard) {
+    public List<String> selectHouseInfoByIdCard(String idCard,String customerId) {
-        List<String> result = baseDao.selectHouseInfoByIdCard(idCard);
+        List<String> result = baseDao.selectHouseInfoByIdCard(idCard,customerId);
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -327,7 +327,7 @@
     </select>
 
     <!-- 查询房屋信息 -->
-    <select id="selectHouseInfoByIdCard" resultType="java.lang.String">
+    <select id="selectHouseInfoByIdCard" parameterType="map" resultType="java.lang.String">
         SELECT
             CONCAT(inh.NEIGHBOR_HOOD_NAME,ib.BUILDING_NAME,ibu.UNIT_NAME,ih.HOUSE_NAME)
         FROM ic_house ih
@@ -336,6 +336,7 @@
         LEFT JOIN ic_building_unit ibu ON (ibu.ID = ih.BUILDING_UNIT_ID AND ibu.DEL_FLAG = '0')
         WHERE ih.DEL_FLAG = '0'
           AND ih.OWNER_ID_CARD = #{idCard}
+          and ih.CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="checkDoorNameUq" parameterType="map" resultType="java.lang.Integer">

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -766,7 +766,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         personData.setIcResiUserId(formDTO.getUserId());
 
         // 房屋信息查询
-        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(),formDTO.getCustomerId());
         if (!listResult.success()){
             throw new RenException("查询房屋信息失败");
         }