修复文章属性栏目属性筛选，添加时间范围搜索

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

@@ -326,7 +326,9 @@
 			and a.content_source like CONCAT("%",#{map.content_source},"%")
 			</if>
 			<if test="map.content_type!=null">
-			and a.content_type like CONCAT("%",#{map.content_type},"%")
+				and <foreach item="item" index="index" collection="map.content_type.split(',')"  open="(" separator="or" close=")">
+					FIND_IN_SET('${item}',a.content_type)
+				</foreach>
 			</if>
 			<if test="map.content_description!=null">
 			and a.content_description like CONCAT("%",#{map.content_description},"%")
@@ -337,6 +339,9 @@
 			<if test="map.content_details!=null">
 			and a.content_details like CONCAT("%",#{map.content_details},"%")
 			</if>
+			<if test="map.content_datetime_start!=null and map.content_datetime_end!=null">
+				and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
+			</if>
 			<if test="tableName!=null and tableName!='' and diyMap!=null">
 				<foreach item="item" index="index" collection="diyList" open=""
 						 separator="" close="">

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

@@ -21,10 +21,8 @@
                         <el-form-item label="栏目名称" prop="categoryTitle">
                             <template slot='label'>栏目名称
                                 <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
-                                       target="_blank">{ms:field.typetitle/}</a>
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                                       target="_blank">[field.typetitle/]</a>
+                                    <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                                       target="_blank">${'$'}{field.typetitle}</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
                             </template>
@@ -157,8 +155,8 @@
                         <el-form-item prop="categoryDiyUrl">
                             <template slot='label'>自定义链接
                                 <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                                       target="_blank">[field.typeurl/]</a>
+                                    <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                                       target="_blank">${'$'}{field.typeurl}</a>
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
                             </template>
@@ -174,8 +172,8 @@
                 <el-form-item label="栏目管理关键字" prop="categoryKeyword" >
                     <template slot='label'>栏目关键字
                         <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                               target="_blank">[field.typekeyword/]</a>
+                            <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">${'$'}{field.typekeyword}</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
                     </template>
@@ -190,8 +188,8 @@
                 <el-form-item label="栏目管理描述" prop="categoryDescrip">
                     <template slot='label'>栏目描述
                         <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                               target="_blank">[field.typedescrip/]</a>
+                            <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">${'$'}{field.typedescrip}</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
                     </template>
@@ -206,10 +204,8 @@
                 <el-form-item label="" prop="categoryImg" >
                     <template slot='label'>缩略图
                         <el-popover slot="label" placement="top-start" title="提示"  trigger="hover">
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
-                               target="_blank">{ms:field.typelitpic/}</a>
-                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                               target="_blank">[field.typelitpic/]</a>
+                            <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                               target="_blank">${'$'}{field.typelitpic}</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
                     </template>

src/main/webapp/templets/1/default/search.htm

@@ -19,8 +19,8 @@
                         {ms:arclist size=10 ispaging=true}
                         <li>
                             <a href="{ms:global.url/}/[field.link/]">
-                                [field.title/]
-                                <span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
+                              ${field.title}
+                                <span class="ms-content-main-li-time">${field.date?string("yyyy-MM-dd")}</span>
                             </a>
                         </li>
                         {/ms:arclist}