From 911c40599a0d78dd00dd02338040e74d5664444c Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Sat, 24 Jul 2021 17:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mingsoft/cms/dao/IContentDao.xml |  2 +-
 .../WEB-INF/manager/cms/category/form.ftl     | 69 ++++++++++---------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 12a61cd8..cc07790b 100755
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -255,7 +255,7 @@
 				(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}
+				and ct.category_id=#{categoryId}
 			</if>
 			<if test="beginTime!=null and beginTime!=''">
 				<if test="_databaseId == 'mysql'">
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index 4adeae70..5b7904fc 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -81,6 +81,25 @@
 
                     </el-col>
                 </el-row>
+                <el-row gutter="0" justify="start" align="top" >
+                    <el-col span="12">
+                        <el-form-item prop="categoryListUrl" label="列表模板" v-if="form.categoryType == '1'">
+                            <el-select v-model="form.categoryListUrl"
+                                       :style="{width: '100%'}"
+                                       :filterable="true"
+                                       :disabled="false"
+                                       :multiple="false" :clearable="true"
+                                       placeholder="请选择列表模板">
+                                <el-option v-for='item in categoryListUrlOptions' :key="item" :value="item"
+                                           :label="item"></el-option>
+                            </el-select>
+                            <div class="ms-form-tip">
+                                当栏目类型为<b>列表</b>时有效
+                            </div>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
                 <el-row
                         gutter="0"
                         justify="start" align="top" >
@@ -119,44 +138,10 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row gutter="0" justify="start" align="top" >
-                    <el-col span="12">
-                        <el-form-item prop="categoryListUrl" label="列表模板" v-if="form.categoryType == '1'">
-                            <el-select v-model="form.categoryListUrl"
-                                       :style="{width: '100%'}"
-                                       :filterable="true"
-                                       :disabled="false"
-                                       :multiple="false" :clearable="true"
-                                       placeholder="请选择列表模板">
-                                <el-option v-for='item in categoryListUrlOptions' :key="item" :value="item"
-                                           :label="item"></el-option>
-                            </el-select>
-                            <div class="ms-form-tip">
-                                当栏目类型为<b>列表</b>时有效
-                            </div>
-                        </el-form-item>
-                    </el-col>
 
-                </el-row>
                 <el-row
                         :gutter="0"
                         justify="start" align="top">
-                    <el-col :span="12">
-                        <el-form-item  label="栏目属性" prop="categoryFlag">
-                            <el-select v-model="form.categoryFlag"
-                                       :style="{width: '100%'}"
-                                       :filterable="false"
-                                       :disabled="false"
-                                       :multiple="true" :clearable="true"
-                                       placeholder="请选择栏目属性">
-                                <el-option v-for='item in categoryFlagOptions' :key="item.dictValue" :value="item.dictValue"
-                                           :label="item.dictLabel"></el-option>
-                            </el-select>
-                            <div class="ms-form-tip">
-                                可以在自定义字典中管理
-                            </div>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="12">
                         <el-form-item  label="生成路径" prop="categoryPinyin">
                             <el-input
@@ -173,7 +158,23 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
+                        <el-form-item  label="栏目属性" prop="categoryFlag">
+                            <el-select v-model="form.categoryFlag"
+                                       :style="{width: '100%'}"
+                                       :filterable="false"
+                                       :disabled="false"
+                                       :multiple="true" :clearable="true"
+                                       placeholder="请选择栏目属性">
+                                <el-option v-for='item in categoryFlagOptions' :key="item.dictValue" :value="item.dictValue"
+                                           :label="item.dictLabel"></el-option>
+                            </el-select>
+                            <div class="ms-form-tip">
+                                可以在自定义字典中管理
+                            </div>
+                        </el-form-item>
                     </el-col>
+
+
                 </el-row>
                 <el-form-item label="关键字" prop="categoryKeyword" >
                     <el-input