From 3c3a8c8265a45f4920045e185c39359924fd1a5f Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Sun, 11 Jul 2021 17:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A0=8F=E7=9B=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/cms/action/GeneraterAction.java    |  2 +-
 .../java/net/mingsoft/cms/bean/ContentBean.java     | 13 +++++++++++++
 src/main/java/net/mingsoft/cms/dao/IContentDao.xml  |  5 ++++-
 .../webapp/WEB-INF/manager/cms/content/main.ftl     |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java
index c43107bf..72d8df4c 100755
--- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java
+++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java
@@ -178,7 +178,7 @@ public class GeneraterAction extends BaseAction {
 
             ContentBean contentBean = new ContentBean();
             contentBean.setCategoryId(column.getId());
-
+            contentBean.setCategoryType(column.getCategoryType());
             articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean);
             // 判断列表类型
             switch (CategoryTypeEnum.get(column.getCategoryType())) {
diff --git a/src/main/java/net/mingsoft/cms/bean/ContentBean.java b/src/main/java/net/mingsoft/cms/bean/ContentBean.java
index a1e54b96..195031bb 100755
--- a/src/main/java/net/mingsoft/cms/bean/ContentBean.java
+++ b/src/main/java/net/mingsoft/cms/bean/ContentBean.java
@@ -62,6 +62,11 @@ public class ContentBean extends ContentEntity {
      */
     private String categoryType;
 
+    /**
+     * 栏目属性，用于筛选文章列表
+     */
+    private String categoryFlag;
+
     public String getCategoryType() {
         return categoryType;
     }
@@ -70,6 +75,14 @@ public class ContentBean extends ContentEntity {
         this.categoryType = categoryType;
     }
 
+    public String getCategoryFlag() {
+        return categoryFlag;
+    }
+
+    public void setCategoryFlag(String categoryFlag) {
+        this.categoryFlag = categoryFlag;
+    }
+
     public String getBeginTime() {
         return beginTime;
     }
diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index b26e8820..12a61cd8 100755
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -250,10 +250,13 @@
 			where ct.del=0
 
 			<!-- 查询子栏目数据 -->
-			<if test="categoryId &gt; 0">
+			<if test="categoryId!=null and  categoryId!='' and categoryType==1">
 				and (ct.category_id=#{categoryId} or ct.category_id in
 				(select id FROM cms_category where find_in_set('${categoryId}',CATEGORY_PARENT_IDS)>0))
 			</if>
+			<if test="categoryId!=null and  categoryId!='' and categoryType==2">
+				ct.category_id=#{categoryId}
+			</if>
 			<if test="beginTime!=null and beginTime!=''">
 				<if test="_databaseId == 'mysql'">
 					and content_datetime &gt;= #{beginTime}
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
index c204a1b2..cc391aaf 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -33,8 +33,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item  label="文章类型" prop="contentType">
-                            <el-select v-model="form.contentType"
+                        <el-form-item  label="文章类型" prop="categoryFlag">
+                            <el-select v-model="form.categoryFlag"
                                        :style="{width: '100%'}"
                                        :filterable="false"
                                        :disabled="false"