mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -22,6 +22,7 @@
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.*;
@@ -130,11 +131,16 @@
    @ApiOperation(value = "分页查询社区活动", response = ComActActivityVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO)
    {
        if(comActActivityVO.getCommunityId()<=0)
        {
            LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
            if (loginUserInfo != null) {
                comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
            }
        }
        comActActivityVO.setIsApplets(1);
        Integer status = comActActivityVO.getStatus();
        if (null != status && status.intValue() == 4) {
@@ -448,8 +454,10 @@
                                  @RequestParam(value = "page", required = false) Integer page,
                                  @RequestParam(value = "size", required = false) Integer size,
                                  @RequestParam(value = "belongTo", required = false) String belongTo,
                                  @RequestParam(value = "unitId", required = false) Long unitId) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo, unitId, this.getLoginUserInfo().getAccount());
                                  @RequestParam(value = "unitId", required = false) Long unitId,
                                  @RequestParam(value = "searchContent",required = false) String searchContent) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page,
                size, belongTo, unitId, this.getLoginUserInfo().getAccount(),searchContent);
    }