fix：修改社区动态and社区活动分页查询参数

DESKTOP-71BH0QO\L、ming

2021-04-12 3c1dc61a89e0434e65f92940c04f2cca17cd4182

fix：修改社区动态and社区活动分页查询参数

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -145,5 +145,7 @@
    @ApiModelProperty("党员活动是否个人发布  1 是 0 否")
    private Integer isPerson;

    @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
    private Integer choice;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java

@@ -82,4 +82,7 @@

    @ApiModelProperty(value = "封面模式：1-小图展示 2-大图展示")
    private Integer coverMode;

    @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
    private Integer choice;
}

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

@@ -55,7 +55,12 @@
            "com_act_activity a \n" +
            "join sys_user u on a.sponsor_id=u.user_id\n" +
            "left join com_act_act_sign s on a.id=s.activity_id \n"+
            " where a.community_id=#{comActActivityVO.communityId}" +
            " where 1=1 " +

            "<if test='comActActivityVO.choice == 0 '>" +
            "AND d.community_id=#{comActActivityVO.communityId}\n" +
            " </if> " +

            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>" +
            " and a.activity_name like concat(#{comActActivityVO.activityName},'%')  \n" +
            " </if> " +

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

@@ -35,8 +35,10 @@
            "FROM\n" +
            "com_act_dyn d\n" +
            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
            "WHERE\n" +
            "d.community_id=#{comActDynVO.communityId}\n" +
            "WHERE 1=1 \n" +
            "<if test='comActDynVO.choice == 0 '>" +
            "and d.community_id=#{comActDynVO.communityId}\n" +
            " </if> " +
            "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
            "AND d.title like concat(#{comActDynVO.title},'%')  \n" +
            " </if> " +