From 9b51a62597487073b54aa27cdd059828ebfcb2ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 19:19:47 +0800
Subject: [PATCH] 加synchronized

---
 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 305c3df..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>
@@ -96,10 +99,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