From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ArticleMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 1f2c4e7..51e2fa9 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}
@@ -93,10 +96,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>
--
Gitblit v1.9.1