!206 修复文章类型无法保存空值。 修复无法进入文章编辑页面问题

Merge pull request !206 from 熊志伟123123/5.0.0

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -49,7 +49,7 @@
 				<if test="categoryManagerId != null">category_manager_id,</if>
 				<if test="appId != null">app_id,</if>
 				<if test="dictId != null">dict_id,</if>
-				<if test="categoryFlag != null and categoryFlag != ''">category_flag,</if>
+				<if test="categoryFlag != null">category_flag,</if>
 				<if test="categoryPath != null and categoryPath != ''">category_path,</if>
 				<if test="categoryParentId != null and categoryParentId != ''">category_parent_id,</if>
 				<if test="createBy &gt; 0">create_by,</if>
@@ -74,7 +74,7 @@
 				<if test="categoryManagerId != null">#{categoryManagerId},</if>
 				<if test="appId != null">#{appId},</if>
 				<if test="dictId != null">#{dictId},</if>
-				<if test="categoryFlag != null and categoryFlag != ''">#{categoryFlag},</if>
+				<if test="categoryFlag != null ">#{categoryFlag},</if>
 				<if test="categoryPath != null and categoryPath != ''">#{categoryPath},</if>
 				<if test="categoryParentId != null and categoryParentId != ''">#{categoryParentId},</if>
 				<if test="createBy &gt; 0">#{createBy},</if>
@@ -105,7 +105,7 @@
 				<if test="categoryManagerId != null">category_manager_id=#{categoryManagerId},</if>
 				<if test="appId != null">app_id=#{appId},</if>
 				<if test="dictId != null">dict_id=#{dictId},</if>
-				<if test="categoryFlag != null and categoryFlag != ''">category_flag=#{categoryFlag},</if>
+				<if test="categoryFlag != null ">category_flag=#{categoryFlag},</if>
 				<if test="categoryPath != null and categoryPath != ''">category_path=#{categoryPath},</if>
 				<if test="createBy &gt; 0">create_by=#{createBy},</if>
 				<if test="createDate != null">create_date=#{createDate},</if>

src/main/java/net/mingsoft/cms/dao/IContentDao.xml

@@ -61,7 +61,7 @@
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 				<if test="contentTitle != null and contentTitle != ''">content_title,</if>
 				<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id,</if>
-				<if test="contentType != null and contentType != ''">content_type,</if>
+				<if test="contentType != null ">content_type,</if>
 				<if test="contentDisplay != null and contentDisplay != ''">content_display,</if>
 				<if test="contentAuthor != null and contentAuthor != ''">content_author,</if>
 				<if test="contentSource != null and contentSource != ''">content_source,</if>
@@ -110,7 +110,7 @@
 			<set>
 				<if test="contentTitle != null and contentTitle != ''">content_title=#{contentTitle},</if>
 				<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id=#{contentCategoryId},</if>
-				<if test="contentType != null and contentType != ''">content_type=#{contentType},</if>
+				<if test="contentType != null ">content_type=#{contentType},</if>
 				<if test="contentDisplay != null and contentDisplay != ''">content_display=#{contentDisplay},</if>
 				<if test="contentAuthor != null and contentAuthor != ''">content_author=#{contentAuthor},</if>
 				<if test="contentSource != null and contentSource != ''">content_source=#{contentSource},</if>

src/main/webapp/WEB-INF/manager/cms/category/form.ftl

@@ -114,6 +114,9 @@
                 <el-row
                         gutter="0"
                         justify="start" align="top">
+
+
+
                     <el-col span="12">
                         <el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
                             <template slot='label'>列表模板
@@ -133,6 +136,22 @@
                             </el-select>
                         </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>
+                        </el-form-item>
+                    </el-col>
+
+
+
                 </el-row>
                 <el-form-item label="栏目管理关键字" prop="categoryKeyword">
                     <template slot='label'>栏目关键字
@@ -250,11 +269,14 @@
                     categoryDiyUrl: '',
                     // 栏目管理的内容模型id
                     mdiyModelId: '',
+                    //栏目字典
+                    categoryFlag: []
                 },
                 categoryTypeOptions: [{"value": "1", "label": "列表"}, {"value": "2", "label": "封面"}],
                 categoryListUrlOptions: [],
                 categoryUrlOptions: [],
                 mdiyModelIdOptions: [],
+                categoryFlagOptions: [],
                 rules: {
                     // 栏目管理名称
                     categoryTitle: [{
@@ -331,6 +353,10 @@
                         if (data.categoryId == '0') {
                             data.categoryId = '';
                         }
+                        if(data.categoryFlag){
+                            data.categoryFlag = data.categoryFlag.join(',');
+                        }
+
                         data.categoryImg = JSON.stringify(data.categoryImg);
                         ms.http.post(url, data).then(function (data) {
                             if (data.result) {
@@ -369,6 +395,9 @@
                 var that = this;
                 ms.http.get(ms.manager + "/cms/category/get.do", {"id": id}).then(function (res) {
                     if (res.result && res.data) {
+                        if(res.data.categoryFlag){
+                            res.data.categoryFlag = res.data.categoryFlag.split(',');
+                        }
                         if (res.data.categoryImg) {
                             res.data.categoryImg = JSON.parse(res.data.categoryImg);
                             res.data.categoryImg.forEach(function (value) {
@@ -431,6 +460,16 @@
                     this.form.categoryImg.splice(index, 1);
                 }
             },
+            //获取categoryFlag数据源
+            categoryFlagOptionsGet() {
+                var that = this;
+                ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'栏目属性',pageSize:99999}).then(function (res) {
+                    that.categoryFlagOptions = res.rows;
+                }).catch(function (err) {
+                    console.log(err);
+                });
+            },
+
             //categoryImg文件上传完成回调
             categoryImgSuccess: function (response, file, fileList) {
                 this.form.categoryImg.push({url: file.url, name: file.name, path: response, uid: file.uid});
@@ -446,12 +485,14 @@
                     this.form.categoryImg.splice(index, 1);
                 }
             },
+
         },
         created() {
             this.getColumnContentModelId();
             this.getTree()
             this.categoryListUrlOptionsGet();
             this.categoryUrlOptionsGet();
+            this.categoryFlagOptionsGet();
             this.form.id = ms.util.getParameter("id");
             if (this.form.id) {
                 this.get(this.form.id);

src/main/webapp/WEB-INF/manager/cms/content/form.ftl

@@ -397,7 +397,7 @@
                         ms.http.get(ms.manager + "/mdiy/model/get.do",{
                             id:this.currCategory.mdiyModelId
                         }).then(function (data) {
-                            if(data.data.id){
+                            if(data.data && data.data.id){
                                 that.rederModel(data.data,JSON.parse(data.data.modelJson))
                             }
                         })