Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java

@@ -1,5 +1,10 @@
package com.panzhihua.service_community.dao;

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,10 +12,6 @@
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
@@ -22,15 +23,20 @@

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     * 
     * @param circleTopicAdminDTO
     *            请求参数
     * @return 邻里圈话题列表
     */
    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page, @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page,
        @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     * 
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId,@Param("isZero") Integer isZero);