101captain
2022-03-03 b5b770b9aea6dc8d448550f9771d0d422e905665
三社功能修改
2个文件已修改
11 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -84,4 +84,6 @@
    @ApiModelProperty(value = "申请提交人ID", hidden = true)
    private Long submitUserId;
    private Long streetId;
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -384,8 +384,13 @@
    @ApiOperation(value = "分页展示志愿者")
    @PutMapping("pagevolunteer")
    public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Long communityId = this.getCommunityId();
        comMngVolunteerMngVO.setCommunityId(communityId);
        if(this.getLoginUserInfo().getStreetId()!=null){
            comMngVolunteerMngVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
        }
        return communityService.pageVolunteer(comMngVolunteerMngVO);
    }