From 17964852a3fed10dec5eaf661631246a577b49a9 Mon Sep 17 00:00:00 2001
From: "rong.liu" <liurong@huorantech.cn>
Date: Wed, 1 Mar 2023 14:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iasf/mapper/xml/SysContentMapper.xml      | 37 ++++++++-----------
 .../service/impl/SysContentServiceImpl.java   | 10 +++--
 .../huoran/iasf/vo/req/PageContentReqVO.java  |  7 ++--
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
index 6aa1f2b..60b9b8a 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
@@ -37,8 +37,8 @@
         </if>
 
 
-        <if test="req.templateStatus ==0">
-           AND  c.is_disable = #{req.templateStatus}
+        <if test="req.isDisable != null and req.isDisable != '' or req.isDisable==0">
+            AND c.is_disable = #{req.isDisable}
         </if>
 
 
@@ -59,7 +59,6 @@
         </if>
 
 
-
     </select>
 
 
@@ -162,24 +161,20 @@
         </if>
     </select>
     <select id="columnConditionsFilterArticles" resultType="com.huoran.iasf.vo.resp.PageContentRespVO">
-        SELECT
-            t.*,
-            ( SELECT cl.list_style_id FROM sys_column cl WHERE cl.id = t.column_id ) AS listStyleId
-        FROM
-            (
-                SELECT
-                    s.*,
-                    ( SELECT GROUP_CONCAT( label_name ) FROM sys_content_label l WHERE deleted = 1 AND FIND_IN_SET( l.id, s.lable_id ) ) AS labelName,
-                    ( SELECT c.classification_name FROM sys_content_classification c WHERE deleted = 1 AND s.classification_id = c.id ) AS classificationName
-                FROM
-                    sys_content s
-                WHERE
-                    s.deleted = 1
-                  AND is_disable = 0
-                  AND is_release = 1
-            ) t
-        WHERE
-            FIND_IN_SET( t.column_id, #{columnId} )
+        SELECT t.*,
+               (SELECT cl.list_style_id FROM sys_column cl WHERE cl.id = t.column_id) AS listStyleId
+        FROM (SELECT s.*,
+                     (SELECT GROUP_CONCAT(label_name)
+                      FROM sys_content_label l
+                      WHERE deleted = 1 AND FIND_IN_SET(l.id, s.lable_id)) AS labelName,
+                     (SELECT c.classification_name
+                      FROM sys_content_classification c
+                      WHERE deleted = 1 AND s.classification_id = c.id)    AS classificationName
+              FROM sys_content s
+              WHERE s.deleted = 1
+                AND is_disable = 0
+                AND is_release = 1) t
+        WHERE FIND_IN_SET(t.column_id, #{columnId})
 
         ORDER BY t.release_time DESC
     </select>
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index a12f431..3b12473 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -61,10 +61,12 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
         if (reqVO.getModifiedTimeSort() == null && reqVO.getPublicationTimeSort() == null) {
             reqVO.setPublicationTimeSort(0);
         }
-        if (reqVO.getTemplateStatus() == null) {
-            //是否禁用(0默认，0启用 1禁用) todo 此处应该为对is_disable进行设置的
-            reqVO.setTemplateStatus(0);
-        }
+        /*if (reqVO.getIsDisable()!=null){
+            if (reqVO.getIsDisable() == 1) {
+                //是否禁用(0默认，0启用 1禁用)
+                reqVO.setIsDisable(1);
+            }
+        }*/
         IPage<PageContentRespVO> pageList = baseMapper.articlePaginationList(page, reqVO);
         return R.success(pageList);
     }
diff --git a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java b/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
index 53df03f..0c9756e 100644
--- a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
+++ b/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
@@ -55,8 +55,9 @@ public class PageContentReqVO extends PageReqVO {
     @ApiModelProperty(value = "发布时间排序(0默认倒序 1升序)")
     private Integer publicationTimeSort;
 
-    @ApiModelProperty(value = "模板状态(0禁用；1启用)")
-    private Integer templateStatus;
-
+   /* @ApiModelProperty(value = "模板状态(0禁用；1启用)")
+    private Integer templateStatus;*/
 
+    @ApiModelProperty(value = "是否禁用(0默认，0启用 1禁用)")
+    private Integer isDisable;
 }
\ No newline at end of file