springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @auther lyq * @create 2021-04-14 15:02:14 @@ -55,6 +57,9 @@ @ApiModelProperty(value = "单位id", hidden = true) private Long checkUnitId; @ApiModelProperty(value = "社区id集合", hidden = true) private List<Long> communityIds; /** * 使用类型（1.邻里圈 2.问题清单 3.需求清单） */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -99,6 +99,13 @@ // } // } // } Long communityId = neighborCircleAppDTO.getCommunityId(); List<Long> communityIds = comActDAO.selectIds(communityId); if (CollUtil.isEmpty(communityIds)) { communityIds = new ArrayList<>(); communityIds.add(communityId); } neighborCircleAppDTO.setCommunityIds(communityIds); Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()); IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO); if (!doPager.getRecords().isEmpty()) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -47,7 +47,11 @@ left join sys_user as su on su.user_id = canc.release_id left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id left join com_act as ca on ca.community_id = canc.community_id where is_del = 2 and canc.status = 2 and canc.community_id = ${neighborCircleAppDTO.communityId} where is_del = 2 and canc.status = 2 and nc.community_id in <foreach collection="neighborCircleAppDTO.communityIds" item="item" index="index" open="(" separator="," close=")"> ${item} </foreach> <if test='neighborCircleAppDTO.topicId != null '> and canc.topic_id = #{neighborCircleAppDTO.topicId} </if>
