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 |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index aa86fa6..efb31cb 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -5,15 +5,21 @@
     <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" >
-                <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}
@@ -22,7 +28,7 @@
                     and a.title like concat ('%',#{record.title},'%')
                 </if>
                 <if test="record.columnIds != null">
-                    and a.column_id =
+                    and a.column_id in
                     <foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
                         #{item}
                     </foreach>
@@ -70,10 +76,58 @@
         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>
+            <if test="record.columnIds != null">
+                and c.id in
+                <foreach collection="record.columnIds" item="item" open="(" close=")" separator=",">
+                    ${item}
+                </foreach>
+            </if>
         </where>
     </select>
+
+    <select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
+        SELECT
+        a.*,
+        b.column_name columnName
+        FROM
+        t_article a
+        left join t_column b on a.column_id = b.id
+        <where>
+            and a.del_status = 1
+            and a.release_status = 1
+            and a.company_id = #{record.companyId}
+            <if test="record != null" >
+                <if test="record.columnId != null">
+                    and a.column_id = #{record.columnId}
+                </if>
+                <if test="record.title!=null">
+                    and a.title like concat ('%',#{record.title},'%')
+                </if>
+                <if test="record.author!=null">
+                    and a.author like concat ('%',#{record.author},'%')
+                </if>
+                <if test="record.timeType!=null">
+                    and a.release_time > #{record.timeType}
+                </if>
+            </if>
+        </where>
+        order by a.is_top desc,a.create_time desc
+    </select>
+
+    <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
+        select * from t_article a
+        where a.column_id=#{columnId} and a.company_id=#{companyId}
+        <if test="type != 4">
+            <if test="type == 2">
+                and release_status=1
+            </if>
+            <if test="type == 3">
+                and release_status=0
+            </if>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1