bug修复

huanghongfa

2021-04-16 297cd3dfb57f0b1ee681fdd64861c8bff00b19e9

bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -69,7 +69,7 @@
     * 社区id
     */
    @ApiModelProperty(value="社区id",hidden = true)
    private Integer actId;
    private Long actId;
    /**
     * 小区id（实有房屋id）
     */

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -687,6 +687,9 @@
    @ApiOperation(value = "分页查询实有人口列表", response = ComMngPopulationVO.class)
    @PostMapping("/population/pagePopulation")
    public R pageQueryComMngRealAssets(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
        //获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
        comMngPopulationVO.setActId(communityId);
        return communityService.pagePopulation(comMngPopulationVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -128,6 +128,9 @@
            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
            "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
            " </if> " +
            "<if test='comMngPopulationVO.actId != null'>" +
            " and cmp.act_id = #{comMngPopulationVO.actId} " +
            " </if> " +
            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
            "AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java

@@ -97,6 +97,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        LambdaQueryWrapper<ComMngVillageDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
        if(pageComMngVillageDTO.getCommunityId() != null){
            userLambdaQueryWrapper.eq(ComMngVillageDO::getCommunityId,pageComMngVillageDTO.getCommunityId());
        }
        if (pageComMngVillageDTO.getAlley() != null) {
            userLambdaQueryWrapper.like(ComMngVillageDO::getAlley, pageComMngVillageDTO.getAlley());
        }