lidongdong
2024-05-31 c2cbd2e3cf5bb3f929ac40052d96c3c27d127277
花城 议事投票列表字段筛选
2个文件已修改
12 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -107,7 +107,6 @@
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
            pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
            Integer isMy = pageComActDiscussDTO.getIsMy();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml
@@ -182,7 +182,16 @@
            <if test='pageComActDiscussDTO.loginUserId != null '>
                LEFT JOIN com_act_discuss_option_user ou ON do.id=ou.discuss_option_id AND ou.user_id=#{pageComActDiscussDTO.loginUserId}
            </if>
            WHERE d.community_id = ${pageComActDiscussDTO.communityId} AND d.is_del = 2 AND d.status != 1
            WHERE d.is_del = 2 AND d.status != 1
                <if test="pageComActDiscussDTO.communityId !=null and pageComActDiscussDTO.communityId !='' ">
                    AND d.community_id = ${pageComActDiscussDTO.communityId}
                </if>
                <if test="pageComActDiscussDTO.status !=null and pageComActDiscussDTO.status !='' ">
                    AND d.status = ${pageComActDiscussDTO.status}
                </if>
                <if test="pageComActDiscussDTO.keyWord !=null and pageComActDiscussDTO.keyWord !='' ">
                    AND  d.vote_title like concat('%',${pageComActDiscussDTO.keyWord},'%')
                </if>
                <if test="pageComActDiscussDTO.isPbMember == 0">
                    AND d.vote_scope != 3
                </if>