springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -36,6 +36,9 @@ @ApiModelProperty("是否置顶 0 否 1 是") private Integer isTopping; @ApiModelProperty("街道id") private Long streetId; @ApiModelProperty(value = "发布时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date publishAt; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -747,10 +747,17 @@ @ApiOperation(value = "分页查询社区动态", response = ComActDynVO.class) @PostMapping("pagedynamic") public R pageDynamic(@RequestBody ComActDynVO comActDynVO) { Long communityId = this.getCommunityId(); comActDynVO.setCommunityId(communityId); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); if(loginUserInfoVO.getCommunityId()!=null && loginUserInfoVO.getCommunityId()>0 ) { comActDynVO.setCommunityId(loginUserInfoVO.getCommunityId()); } if(loginUserInfoVO.getStreetId()!=null && loginUserInfoVO.getStreetId()>0 ) { comActDynVO.setStreetId(loginUserInfoVO.getStreetId()); } Integer category = comActDynVO.getCategory(); log.info("当前登录的社区id"+communityId); if (isNull(category)) { comActDynVO.setCategory(1); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml
@@ -207,6 +207,10 @@ and d.community_id = ${comActDynVO.communityId} </if> <if test="comActDynVO.communityId == null and comActDynVO.streetId != null" > and d.community_id in (select community_id from com_act where street_id=#{comActDynVO.streetId}) </if> <if test="comActDynVO.category != null"> AND d.category = #{comActDynVO.category} </if>