java/zhihuishenqu.git

			@@ -307,6 +307,15 @@
			}
			page.setSize(pageSize);
			page.setCurrent(pageNum);
			Long communityId = comActActivityVO.getCommunityId();
			if (null != communityId){
			List<Long> communityIds = comActDAO.selectIds(communityId);
			if (CollUtil.isEmpty(communityIds)) {
			communityIds = new ArrayList<>();
			communityIds.add(communityId);
			}
			comActActivityVO.setCommunityIds(communityIds);
			}
			Integer type = comActActivityVO.getType();
			IPage<ComActActivityVO> iPage = null;
			if (nonNull(type) && type.equals(4)) {

			@@ -364,12 +364,19 @@
			LEFT JOIN ( SELECT * FROM com_act_act_sign WHERE `status` = 1 ) s ON a.id = s.activity_id
			LEFT JOIN com_act ca ON a.community_id = ca.community_id
			WHERE 1 = 1
			<if test ="comActActivityVO.communityId != null and comActActivityVO.communityId != 0">
			<if test ="comActActivityVO.communityIds != null and comActActivityVO.communityIds.size() != 0">
			<if test="comActActivityVO.checkUnitId != null">
			AND (a.community_id = ${comActActivityVO.communityId} OR a.check_unit_id = #{comActActivityVO.checkUnitId})
			AND (a.community_id in
			<foreach collection="comActActivityVO.communityIds" item="item" open="(" separator="," close=")">
			#{item}
			</foreach>
			OR a.check_unit_id = #{comActActivityVO.checkUnitId})
			</if>
			<if test="comActActivityVO.checkUnitId == null">
			AND a.community_id = ${comActActivityVO.communityId}
			AND a.community_id in
			<foreach collection="comActActivityVO.communityIds" item="item" open="(" separator="," close=")">
			#{item}
			</foreach>
			<if test="comActActivityVO.type == null">
			AND a.`type` != 5
			</if>

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史