议事议题优化

linwei

2024-02-23 bc887a864d795aa2b555597960904f3d01c5f014

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml

@@ -113,12 +113,12 @@

            <if test="article.districtId != null and article.districtId != ''">
                and (ja.article_range like concat('%',#{article.districtId},'%')
                or ja.article_range is null)
                or ja.article_range is null or ja.article_range  = '')
            </if>

            <if test="article.userId != null">
                and (jpd.appoint_user like concat('%',#{article.userId},'%')
                or jpd.appoint_user is null)
                and (jpd.user_ids like concat('%',#{article.userId},'%')
                OR jpd.user_ids IS NULL or jpd.user_ids  = '')
            </if>

            <if test="article.building != null and article.building != ''">
@@ -545,8 +545,15 @@
        jczz_article ja
        LEFT JOIN jczz_district jd ON ja.district_id = jd.id
        LEFT JOIN blade_region br on br.`code` = jd.community_code
        LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
        where 1=1
        and ja.is_deleted = 0

        <if test="article.eventType != null">
            and jpd.event_type = #{article.eventType}
            and jpd.end_time is not null
        </if>

        <if test="article.propertyFlag!=null ">
            <if test="article.communityName!=null and article.communityName!=''">
                and br.`village_name` like concat('%',#{article.communityName},'%')