lin
2024-02-27 3501ca8469b1a09f22cf0d3dbbe1adf331ea814a
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 ja.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 != ''">
@@ -199,7 +199,6 @@
        where 1=1
        and ja.is_deleted = 0
        <if test="article.propertyFlag!=null ">
            and ja.district_id IS NOT NULL
            <if test="article.communityName!=null and article.communityName!=''">
                and br.`village_name` like concat('%',#{article.communityName},'%')
            </if>
@@ -239,10 +238,10 @@
            <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
            </foreach>
            )
            and ja.district_id in
            <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
<!--            and ja.district_id in-->
<!--            <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">-->
<!--                #{item}-->
<!--            </foreach>-->
        </if>
        order by ja.create_time desc
    </select>
@@ -536,4 +535,67 @@
        WHERE jda.address_code = #{houseCode}
    </select>
    <select id="getArticleByDistrictId" resultType="org.springblade.modules.article.vo.ArticleVO"
            parameterType="org.springblade.modules.article.vo.ArticleVO">
        SELECT
        ja.*,
        br.`village_name` communityName,
        br.town_name streetName
        FROM
        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
            and jpd.end_time &lt;= SYSDATE()
        </if>
        <if test="article.propertyFlag!=null ">
            <if test="article.communityName!=null and article.communityName!=''">
                and br.`village_name` like concat('%',#{article.communityName},'%')
            </if>
            <if test="article.streetName!=null and article.streetName!=''">
                and br.town_name like concat('%',#{article.streetName},'%')
            </if>
        </if>
        <if test="article.title!=null and article.title!=''">
            and ja.title like concat('%',#{article.title},'%')
        </if>
        <if test="article.sourceName!=null and article.sourceName!=''">
            and ja.source_name like concat('%',#{article.sourceName},'%')
        </if>
        <if test="article.startTime!=null and article.startTime!=''">
            and ja.create_time&gt;=#{article.startTime}
        </if>
        <if test="article.endTime!=null and article.endTime!=''">
            and ja.create_time&lt;=#{article.endTime}
        </if>
        <if test="article.publish!=null and article.publish!=''">
            and ja.publish = #{article.publish}
        </if>
        <if test="article.articleType!=null and article.articleType!=''">
            and ja.article_type like concat('%',#{article.articleType},'%')
        </if>
        <if test="article.type != null ">and ja.type = #{article.type}</if>
        <if test="article.keyword!=null and article.keyword!=''">
            AND CONCAT(ja.title,ja.source_name)
            LIKE CONCAT ('%', #{article.keyword},'%')
        </if>
        <if test="article.districtIdList != null and article.districtIdList.size() > 0 ">
            and (ja.article_range like
            <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
            </foreach>
            )
        </if>
        order by ja.create_time desc
    </select>
</mapper>