diff --git a/src/main/resources/mapper/activity/ContentMapper.xml b/src/main/resources/mapper/activity/ContentMapper.xml
index 35ecf1f..0e77fe9 100644
--- a/src/main/resources/mapper/activity/ContentMapper.xml
+++ b/src/main/resources/mapper/activity/ContentMapper.xml
@@ -468,7 +468,7 @@
FROM
data_dict_item item
LEFT JOIN content_tags tags ON item.id = tags.tid
- LEFT JOIN content c ON c.id = tags.cid
+ LEFT JOIN content c ON c.id = tags.cid and c.online_time is not null
WHERE
item.dictid = 26
GROUP BY
diff --git a/src/main/resources/templates/content/edit2.html b/src/main/resources/templates/content/edit2.html
index a6d6854..eef203c 100644
--- a/src/main/resources/templates/content/edit2.html
+++ b/src/main/resources/templates/content/edit2.html
@@ -445,7 +445,6 @@ var caseType = [[${caseType}]];
if(release === '1' ){
$("#applicationStatus").append("\n").attr("selected",true);
}else if(release === '2' ){
- console.log(release)
$("#applicationStatus").append("\n").attr("selected",true);
}else if(release === '4' ){
$("#applicationStatus").append("\n").attr("selected",true);
@@ -535,6 +534,14 @@ var caseType = [[${caseType}]];
// 提交保存
$("#btn_save").on('click', function () {
+ //编辑器需输入文本值 不然只输入图片 编辑器会出bug
+ var str = $("#desct").val();
+ str = str.substr(str.length-1,1);
+ if(str === ">"){
+ alert("请输入文本值!");
+ return;
+ }
+
if($("#contentType26").val() === null){
alert('关联部门不能为空!');
return;