From 7ed2efc56e0bd3965388f97f9a2db350f6e4e382 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 11:46:35 +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 51e2fa9..efb31cb 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/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>
--
Gitblit v1.9.1