From cee43c11fe6772305e19e7ddee1e8276060046d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 16:15:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ArticleMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 43ec8e5..aa86fa6 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -55,8 +55,25 @@
</select>
<select id="selectArticleById" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
- select a.*, b.column_code, b.column_name
+ select a.*, b.column_code, b.column_name, b.path
from t_article a, t_column b
where a.column_id=b.id and a.id=#{id}
</select>
+
+ <select id="selectArticleInPage" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
+ select
+ a.*,
+ b.column_code,
+ b.column_name,
+ b.path
+ from t_article a
+ 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}
+ <if test="record.columnCode != null and record.columnCode != ''">
+ and c.column_code=#{record.columnCode}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1