评论单独页，内容删除 bugfix

polaris1119 · polaris1119 · commit c914eeebefd3 · 2020-06-15T19:40:28.000+08:00
diff --git a/logic/article.go b/logic/article.go
@@ -718,7 +718,7 @@ func (self ArticleLogic) FindByIds(ids []int) []*model.Article {
 		return nil
 	}
 	articles := make([]*model.Article, 0)
-	err := MasterDB.In("id", ids).Find(&articles)
+	err := MasterDB.In("id", ids).Where("status<=?", model.ArticleStatusOnline).Find(&articles)
 	if err != nil {
 		logger.Errorln("ArticleLogic FindByIds error:", err)
 		return nil
diff --git a/logic/topic.go b/logic/topic.go
@@ -385,6 +385,9 @@ func (self TopicLogic) FindFullinfoByTids(tids []int) []map[string]interface{} {
 	topicInfos := make([]*model.TopicInfo, 0, len(topicInfoMap))
 	for _, tid := range tids {
 		if topicInfo, ok := topicInfoMap[tid]; ok {
+			if topicInfo.Flag > model.FlagNormal {
+				continue
+			}
 			topicInfos = append(topicInfos, topicInfo)
 		}
 	}
diff --git a/template/markdown.html b/template/markdown.html
@@ -59,9 +59,6 @@ <h1 style="text-align: center;">Markdown 教程</h1>
 ```
 ![alt 文本](http://image-path.png)
 ![alt 文本](http://image-path.png &quot;图片 Title 值&quot;)
-![设置图片宽度高度](http://image-path.png =300x200)
-![设置图片宽度](http://image-path.png =300x)
-![设置图片高度](http://image-path.png =x200)
 ```
 
 ### 代码块
@@ -116,13 +113,13 @@ <h1 style="text-align: center;">Markdown 教程</h1>
 #### 有序列表
 
 1. Go
-  1. Gofmt
-  2. Revel
-  3. Gin
-  4. Echo
+    1. Gofmt
+    2. Revel
+    3. Gin
+    4. Echo
 2. PHP
-  1. Laravel
-  2. ThinkPHP
+    1. Laravel
+    2. ThinkPHP
 3. Java
 
 ### 表格
@@ -287,4 +284,4 @@ <h3 id="表格">表格</h3>
 
 {{define "js"}}
 {{include "cssjs/prism.js.html" .}}
-{{end}}
+{{end}}

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ func (self ArticleLogic) FindByIds(ids []int) []*model.Article {`
`718`	`718`	`return nil`
`719`	`719`	`}`
`720`	`720`	`articles := make([]*model.Article, 0)`
`721`		`- err := MasterDB.In("id", ids).Find(&articles)`
	`721`	`+ err := MasterDB.In("id", ids).Where("status<=?", model.ArticleStatusOnline).Find(&articles)`
`722`	`722`	`if err != nil {`
`723`	`723`	`logger.Errorln("ArticleLogic FindByIds error:", err)`
`724`	`724`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,9 @@ func (self TopicLogic) FindFullinfoByTids(tids []int) []map[string]interface{} {`
`385`	`385`	`topicInfos := make([]*model.TopicInfo, 0, len(topicInfoMap))`
`386`	`386`	`for _, tid := range tids {`
`387`	`387`	`if topicInfo, ok := topicInfoMap[tid]; ok {`
	`388`	`+ if topicInfo.Flag > model.FlagNormal {`
	`389`	`+ continue`
	`390`	`+ }`
`388`	`391`	`topicInfos = append(topicInfos, topicInfo)`
`389`	`392`	`}`
`390`	`393`	`}`