三社功能修改

101captain

2022-03-02 b61c90bea6d79137eed1d490ab2b555451664e48

三社功能修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -60,4 +60,7 @@

    @ApiModelProperty(value = "父类id")
    private Long parentId;

    @ApiModelProperty("街道id")
    private Long streetId;
}

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

@@ -42,7 +42,12 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActColumnSelectAll(commonPage);
    }

@@ -110,6 +115,12 @@
    @ApiOperation("项目分类级联查询")
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        comActColumnVO.setCommunityId(this.getCommunityId());
        return this.communityService.queryLevel(comActColumnVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -86,4 +86,6 @@

    private Long parentId;

    private Long streetId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml

@@ -23,6 +23,9 @@
            <if test="commonPage.communityId!=null">
                and community_id = #{commonPage.communityId}
            </if>
            <if test="commonPage.streetId!=null">
                and street_id = #{commonPage.streetId}
            </if>
            <if test="commonPage.status!=null">
                and status =#{commonPage.status}
            </if>
@@ -51,6 +54,9 @@
            <if test="communityId !=null ">
                and t.community_id =#{communityId}
            </if>
            <if test="streetId !=null ">
                and t.street_id =#{streetId}
            </if>
            <if test="type !=null ">
                and t.type =#{type}
            </if>