Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

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

@@ -114,6 +114,10 @@
                or ja.article_range is null or ja.article_range = '')
            </if>

            <if test="article.districtId == null ">
                and ja.article_range is  null
            </if>

            <if test="article.householdId != null">
                and (FIND_IN_SET ( #{article.householdId}, jpd.user_ids )
                OR jpd.user_ids IS NULL or jpd.user_ids = '')
@@ -594,4 +598,25 @@
        order by ja.create_time desc

    </select>

    <select id="getAllList" resultType="org.springblade.modules.article.entity.Article">
        SELECT
        ja.*
        FROM
        jczz_article ja
        where 1=1
        and ja.is_deleted = 0
        and ja.publish = 1
        limit #{i},#{size}
    </select>

    <select id="getAllListTotal" resultType="java.lang.Integer">
        SELECT
        count(*)
        FROM
        jczz_article ja
        where 1=1
        and ja.is_deleted = 0
        and ja.publish = 1
    </select>
</mapper>