From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/resources/mapper/ArticleMapper.xml |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 9e2ea47..305c3df 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -12,9 +12,9 @@
         <where>
             and a.del_status = 1
             <if test="record != null" >
-                <if test="record.columnlist != null">
+                <if test="record.columnList != null">
                     and a.column_id in
-                    <foreach collection="record.columnlist" separator="," close=")" open="(" item="item">
+                    <foreach collection="record.columnList" separator="," close=")" open="(" item="item">
                         #{item}
                     </foreach>
                 </if>
@@ -116,4 +116,17 @@
         </where>
         order by a.is_top desc,a.create_time desc
     </select>
+
+    <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
+        select * 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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1