From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

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

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 6564050..9e2ea47 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -12,8 +12,11 @@
         <where>
             and a.del_status = 1
             <if test="record != null" >
-                <if test="record.columnId != null">
-                    and a.column_id = #{record.columnId}
+                <if test="record.columnlist != null">
+                    and a.column_id in
+                    <foreach collection="record.columnlist" separator="," close=")" open="(" item="item">
+                        #{item}
+                    </foreach>
                 </if>
                 <if test="record.companyId != null">
                     and a.company_id = #{record.companyId}

--
Gitblit v1.9.1