fix

Helius

2022-07-09 3f0a2632a7d020a56332b44830a2fe5b8c269221

 src/main/resources/mapper/ArticleMapper.xml

@@ -5,10 +5,13 @@
    <select id="selectAdminArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminArticleVo">
        SELECT
        a.*,
        b.column_name columnName
        b.column_name columnName,
        c.web_address baseUrl,
        b.path path
        FROM
        t_article a
        left join t_column b on a.column_id = b.id
        inner join t_company c on a.company_id=c.id
        <where>
            and a.del_status = 1
            <if test="record != null" >
@@ -73,7 +76,7 @@
        inner join t_column b on a.column_id=b.id
        inner join t_column c on b.parent_id=c.id or c.id=b.id
        <where>
            a.company_id=#{record.companyId}
            a.company_id=#{record.companyId} and a.del_status = 1
            <if test="record.columnCode != null and record.columnCode != ''">
                and c.column_code=#{record.columnCode}
            </if>
@@ -96,10 +99,8 @@
        <where>
            and a.del_status = 1
            and a.release_status = 1
            and a.company_id = #{record.companyId}
            <if test="record != null" >
                <if test="record.companyId != null">
                    and a.company_id = #{record.companyId}
                </if>
                <if test="record.columnId != null">
                    and a.column_id = #{record.columnId}
                </if>
@@ -118,6 +119,19 @@
    </select>

    <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
        select a.id from t_article a
        where a.column_id=#{columnId} and a.company_id=#{companyId}
        <if test="type != 4">
            <if test="type == 2">
                and release_status=1
            </if>
            <if test="type == 3">
                and release_status=0
            </if>
        </if>
    </select>

    <select id="selectArticleByColumnId" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
        select * from t_article a
        where a.column_id=#{columnId} and a.company_id=#{companyId}
        <if test="type != 4">