diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
index 2648208..10e4b2f 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
@@ -1,15 +1,14 @@
 package com.lyms.base.common.dao.content;
 
-import java.io.Serializable;
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.content.ContentMessageTemplate;
 import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
 import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+import org.springframework.stereotype.Repository;
+
+import java.io.Serializable;
+import java.util.List;
 /**
  * <p>
  * Mapper接口
@@ -24,5 +23,7 @@ public interface ContentMessageTemplateMapper extends BaseMapper<ContentMessageT
   public Integer deleteLogicById(Serializable id);
 
   public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , MsgTempSerachDTO msgTemp);
+
+  public List<ContentMessageTemplateDTO> getContentMessageTemplate(MsgTempSerachDTO msgTemp);
   
 }
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml
index 65c9362..8c6c842 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml
@@ -29,14 +29,14 @@
     <select id="getContentMessageTemplate" resultType="com.lyms.base.common.vo.content.ContentMessageTemplateDTO" parameterType="com.lyms.base.common.vo.content.MsgTempSerachDTO">
     	select m.id as id,m.CONTENT as content,t.TAGS_IDS as contentTagIds from CONTENT_MESSAGE_TEMPLATE m left join CONTENT_TEMPLATE_MESSAGE_TAGS t on m.ID = t.MESSAGE_TEMPLATE
     	 <where>
-			 <if test="verIds!=null">
+			 <if test="verId!=null">
 				 and m.TEMPLATE_VERSION_ID =#{verId}
 			 </if>
 			 <if test="msgContent!=null">
 				 and m.CONTENT LIKE  concat("%",#{msgContent},"%")
 			 </if>
 			 <if test="tagId!=null">
-				 and t.TAGS_IDS LIKE concat("%,",#{verIds},",%")
+				 and t.TAGS_IDS LIKE concat("%,",#{tagId},",%")
 			 </if>
 		 </where>
 
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java
index 9af3dd4..a1613ed 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.java
@@ -3,6 +3,7 @@ package com.lyms.base.common.dao.content;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.content.ContentTags;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.io.Serializable;
@@ -21,5 +22,5 @@ public interface ContentTagsMapper extends BaseMapper<ContentTags> {
 
   public Integer deleteLogicById(Serializable id);
 
-   public List<ContentTags> getTags(Page<ContentTags> page, String name);
+   public List<ContentTags> getTags(Page<ContentTags> page, @Param("name") String name);
 }
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml
index eeea26c..9ea36c3 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml
@@ -24,11 +24,11 @@
         ID AS id, TAG_NAME AS tagName, TAG_DESC AS tagDesc, LEVEL AS level, PERENT_ID AS perentId, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable
     </sql>
 
-	<select id="getTags" resultMap="BaseResultMap">
+	<select id="getTags" resultMap="BaseResultMap" parameterType="java.lang.String">
 		select ID,TAG_NAME,TAG_DESC,`LEVEL`,PERENT_ID from CONTENT_TAGS
 		<where>
-			<if test="name!=null">
-				and `TAG_NAME` = #{name}
+			<if test="name !=null">
+				and `TAG_NAME` LIKE concat('%',#{name},"%");
 			</if>
 		</where>
 	</select>
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTemplateVersion.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTemplateVersion.java
index 64d1df5..e129e86 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTemplateVersion.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentTemplateVersion.java
@@ -76,7 +76,6 @@ public class ContentTemplateVersion implements Serializable {
 	@TableField(value="ENABLE")
 	private Integer enable;
 
-
 	public String getId() {
 		return id;
 	}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
index 224fe92..ac608e9 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
@@ -1,13 +1,14 @@
 package com.lyms.base.common.service.content;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.content.ContentMessageTemplate;
 import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
 import com.lyms.base.common.vo.content.MsgTempSerachDTO;
 import com.lyms.web.service.BaseService;
 
+import java.io.Serializable;
+import java.util.List;
+
 
 /**
  * <p>
@@ -27,5 +28,7 @@ public interface ContentMessageTemplateService extends BaseService<ContentMessag
   public Integer deleteLogicById(Serializable id);
 
   public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp);
-	
+
+  public List<ContentMessageTemplateDTO> getContentMessageTemplate(MsgTempSerachDTO msgTemp);
+
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
index b9a1104..9397dbd 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
@@ -1,10 +1,5 @@
 package com.lyms.base.common.service.content.impl;
 
-import java.io.Serializable;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
@@ -12,6 +7,10 @@ import com.lyms.base.common.entity.content.ContentMessageTemplate;
 import com.lyms.base.common.service.content.ContentMessageTemplateService;
 import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
 import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -34,4 +33,9 @@ public class ContentMessageTemplateServiceImpl extends ServiceImpl<ContentMessag
 		page.setRecords(lists);
 		return page;
 	}
+
+	@Override
+	public List<ContentMessageTemplateDTO> getContentMessageTemplate(MsgTempSerachDTO msgTemp) {
+		return baseMapper.getContentMessageTemplate(msgTemp);
+	}
 }
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
index 3e70ba9..00e581c 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
@@ -83,6 +83,8 @@ public class ContentMessageTemplateController extends BaseController {
     	ContentMessageTemplate messTemp = new ContentMessageTemplate();
     	messTemp.setId(StrUtils.uuid());
     	messTemp.setCreateTime(new Date());
+    	messTemp.setEnable(0);
+    	messTemp.setIfdel(0);
     	messTemp.setKeyCode(messTemp.getId());
     	messTemp.setContent(contentMessage.getContent());
     	messTemp.setRichTitle(contentMessage.getRichTitle());
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java
index 525b470..95eff02 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java
@@ -67,7 +67,7 @@ public class ContentTagsController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
-    public Map<String, Object> list(@RequestParam(defaultValue= "",value="name",required = false) String name) {
+    public Map<String, Object> list(@RequestParam(value="name",required = false) String name) {
         Page<ContentTags> page = getPage();
         if(StrUtils.isNotEmpty(name)){
             page = contentTagsService.getTags(page,name);
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java
index acaaaa7..89c21c7 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java
@@ -3,8 +3,10 @@ package com.lyms.cm.controller.content;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.content.ContentTemplateVersion;
-import com.lyms.base.common.entity.organ.OrganGroup;
+import com.lyms.base.common.service.content.ContentMessageTemplateService;
 import com.lyms.base.common.service.content.ContentTemplateVersionService;
+import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
 import com.lyms.constants.OperationName;
 import com.lyms.util.StrUtils;
 import com.lyms.web.bean.AjaxResult;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,7 +34,9 @@ import java.util.Map;
 public class ContentTemplateVersionController extends BaseController {
     @Autowired
     private ContentTemplateVersionService templateVersionService;
-
+    //模板信息
+    @Autowired
+    private ContentMessageTemplateService messageTemplateService;
     /**
      * 列表
      * @param model
@@ -58,8 +63,17 @@ public class ContentTemplateVersionController extends BaseController {
     
     @ResponseBody
     @RequestMapping(value = "/create", method = { RequestMethod.POST })
-    public AjaxResult create(ContentTemplateVersion templateVersion, AjaxResult ajaxResult) {
-        boolean tag = templateVersionService.create(templateVersion);
+    public AjaxResult create(ContentTemplateVersion templateVersion,String perId, AjaxResult ajaxResult) {
+        boolean tag = false;
+        if(StrUtils.isNotEmpty(perId)){//复制版本
+            MsgTempSerachDTO msgTemp = new MsgTempSerachDTO();
+            msgTemp.setVerId(perId);
+            List<ContentMessageTemplateDTO> messageList = messageTemplateService.getContentMessageTemplate(msgTemp);
+            for(ContentMessageTemplateDTO ctd : messageList){
+                System.out.println("tagsId:"+ctd.getContentTagIds());
+            }
+        }
+        tag = templateVersionService.create(templateVersion);
         return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
     }
 
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html
index ddd6902..e911faa 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html
@@ -39,8 +39,8 @@
 						</select>
 					</div>
 				</div>
-				<div class="hr-line-dashed"></div>
-				<div class="form-group">
+				<div class="hr-line-dashed" style="display: none;"></div>
+				<div class="form-group" style="display: none;">
 					<label class="col-sm-2 control-label">权重：</label>
 					<div class="col-sm-5">
 						<input type="number" class="form-control" class="form-control" placeholder="选填" name="weight">
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html
index c82c829..ab19e7e 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_edit.html
@@ -7,12 +7,10 @@
     <div class="ibox-content">
     	<div class="col-sm-12">
 	        <form id="validForm" class="form-horizontal m-t" novalidate="novalidate">
-	        	<input id="resource" name="roles" type="hidden" value="$!userRoles"/>
-	        	<input type="hidden" id="user.id" name="id" value="$!user.id"/>
 	            <div class="form-group">
-	                <label class="col-sm-2 control-label">短信内容：</label>
+	                <label class="col-sm-2 control-label">*短信内容：</label>
 	                <div class="col-sm-5">
-	                	<textarea class="form-control" rows="4" cols="12" aria-required="true" name="content" required="true" placeholder="请输入短信内容"></textarea>
+	                	<textarea class="form-control" rows="4" cols="12" name="content" required placeholder="请输入短信内容"></textarea>
 	                </div>
 	            </div>
 	            <div class="form-group">
@@ -98,6 +96,8 @@
 				data.data.forEach(function(d, i) {
 					optionTagHtml += '<option value="'+d.id+'">' + d.tagName + '</option>';
 				});
+
+
 				//默认一个选择标签
 				addSeleTags();
 			}
@@ -133,11 +133,13 @@
 			}else{
 				data+="&isRich=0";
 			}
+			ajaxPost(APP.PATH + "/contentMessageTemplate/create",data);
+			parent.reloadGrid('dataTable');
+
+//            $('#validForm')[0].reset();
+//            UE.getEditor('editor').setContent("");
+
 
-			
-			alert(data);
-			//ajaxPost(APP.PATH + "/contentMessageTemplate/create",data);
-			//parent.reloadGrid('dataTable');
 		}
 	}
 </script>
\ No newline at end of file
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
index 20d77da..1b68b1f 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
@@ -11,7 +11,7 @@
                 <div class="ibox-content mailbox-content">
                     <div class="container-fluid">
                         <button  class="glyphicon glyphicon-plus btn btn-block btn-primary compose-mail btn-group-lg" onclick="addVer()">消息模板版本</button >
-                        <ul class="list-group" id="temp_version">
+                        <ul class="list-group col-sm-12" id="temp_version">
                         </ul>
                         <div class="clearfix"></div>
                     </div>
@@ -34,10 +34,9 @@
                                 <label for="msgContent">短信内容：</label>
                                 <input type="text" class="form-control" id="msgContent" placeholder="短信内容">
                             </div>
-                            <div class="form-group" style="margin-left: 20px;">
+                            <div class="form-group" style="margin-left: 20px;display: none;">
                                 <label>标签:</label>
                                 <select class="form-control m-b" id="searchTags" style="margin-bottom: 0;">
-                                  
                                 </select>
                             </div>
 
@@ -77,7 +76,7 @@
 		  ,shade: 0.6 //遮罩透明度
 		  ,maxmin: true //允许全屏最小化
 		  ,anim: 2 //0-6的动画形式，-1不开启
-		  ,content: "<div class='col-sm-9 col-sm-offset-1'><form class='form-horizontal m-t navbar-form navbar-left' id='validForm'><div class='form-group'><label class='col-sm-4 control-label'>版本名称：</label><div class='col-sm-5'><input type='text' class='form-control w-lg' placeholder='版本名称' id='verName'  aria-required='true'  required></div></div><div class='col-sm-offset-12'><button type='submit' onclick='return saveVersion()' class='btn btn-primary navbar-btn'>提交</button></div></form></div>"
+		  ,content: "<div class='col-sm-9 col-sm-offset-1'><form action='#' class='form-horizontal m-t navbar-form navbar-left' id='validForm'><div class='form-group'><label class='col-sm-4 control-label'>版本名称：</label><div class='col-sm-5'><input type='text' class='form-control w-lg' placeholder='版本名称' id='versionName' name='versionName'  aria-required='true'  required></div></div><div class='col-sm-offset-12'><a onclick='saveVersion()' class='btn btn-primary navbar-btn'>提交</a></div></form></div>"
 		});    
 	}
 
@@ -85,13 +84,10 @@
         var msgContent = $("#msgContent").val();
         var searchTags = $("#searchTags").val();
 
-        var querys = {};
-        if(msgContent!=""){
-            querys.columnId = msgContent;
-        }
-        if(searchTags!=""){
-            querys.type = searchTags;
-        }
+        var querys = {verId:version.id};
+        querys.msgContent = msgContent;
+
+        querys.type = searchTags;
 
         var queryParams = {
             query:querys
@@ -102,7 +98,7 @@
     function initTagsData(){
 		$.get("${ctx}/contentTags/seleList", "json", function(data) {
 			if (data.success) {
-                var optionTagHtml = "";
+                var optionTagHtml = "<option value=''>全部</option>";
 				data.data.forEach(function(d, i) {
 					optionTagHtml += '<option value="'+d.id+'">' + d.tagName + '</option>';
 				});
@@ -113,10 +109,8 @@
 	
 	function saveVersion(){
         if($('#validForm').valid()){
-		    var verName = $("#verName").val();
-            ajaxPost(APP.PATH +'/contentTemplateVersion/create',"versionName="+verName);
-        }else{
-            return false;
+            var data = $('#validForm').serialize();
+            ajaxPost(APP.PATH +'/contentTemplateVersion/create',data);
         }
 	}
 	function add() {
@@ -125,26 +119,18 @@
 			layer.msg('请先选择消息模板版本');
 			return;
 		}
-		
 		fullWindow("新增信息模板", APP.PATH + controllerRequestMappint + verId+"/toEdit");
 	}
 
 	var templateVer = [];
+	var version = "";
     function showMessageList(vId){
-    	var version = templateVer[vId];
+    	version = templateVer[vId];
     	$("#verId").val(version.id);
     	$("#version").text(version.versionName);
 
-        var msgContent = $("#msgContent").val();
-        var searchTags = $("#searchTags").val();
-
         var querys = {verId:version.id};
-        if(msgContent!=""){
-            querys.columnId = msgContent;
-        }
-        if(searchTags!=""){
-            querys.type = searchTags;
-        }
+
     	var queryParams = {
     			query:querys
     		}
@@ -160,8 +146,8 @@
             sortable: false,           //是否启用排序
             sidePagination: "server",      //分页方式：client客户端分页，server服务端分页（*）
             pageNumber:1,            //初始化加载第一页，默认第一页
-            pageSize: 999,            //每页的记录行数（*）
-            pageList: [999],    //可供选择的每页的行数（*）
+            pageSize: 50,            //每页的记录行数（*）
+            pageList: [200],    //可供选择的每页的行数（*）
             strictSearch: true,
             queryParams:{
                 verId:0
@@ -183,7 +169,19 @@
                 field: 'content',
                 title: '短信内容'
             }]});
+    }
 
+    function copyVer(ver){
+        layer.open({
+            type: 1 //Page层类型
+            ,area: ['530px', '300px']
+            ,title: '新增消息模板版本'
+            ,shade: 0.6 //遮罩透明度
+            ,maxmin: true //允许全屏最小化
+            ,anim: 2 //0-6的动画形式，-1不开启
+            ,content: "<div class='col-sm-9 col-sm-offset-1'><form class='form-horizontal m-t navbar-form navbar-left' id='validForm'><div class='form-group'><label class='col-sm-4 control-label'>版本名称：</label><div class='col-sm-5'><input type='hidden' name='perId' value='"+ver+"'/>" +
+            "<input type='text' class='form-control w-lg' placeholder='版本名称' name='versionName'   required></div></div><div class='col-sm-offset-12'><a onclick='saveVersion()' class='btn btn-primary navbar-btn'>提交</a></div></form></div>"
+        });
     }
 
     $(function(){
@@ -200,7 +198,7 @@
                 if(data){
                 	templateVer = data;
                     data.forEach(function(i,d){
-                        versionHtml+="<li onclick='showMessageList("+d+")' class='list-group-item'>"+i.versionName+"</li>";
+                        versionHtml+="<li onclick='showMessageList("+d+")' class='list-group-item col-sm-9'>"+i.versionName+"</li><button onclick=copyVer('"+i.id+"') class='col-sm-3 btn'>复制</button>";
                     });
                     $("#temp_version").append(versionHtml);
                 }