合并分支 'test' 到 'master'

Test



查看合并请求 !3

@@ -86,13 +86,23 @@ func (l *MiniArticleBackupSearchLogic) MiniArticleBackupSearch(req *types.MiniAr
 			case "WhoReview":
 			case "WhoReview":
 				changeFiled = append(changeFiled, "修改了评论范围")
 				changeFiled = append(changeFiled, "修改了评论范围")
 			case "Section":
 			case "Section":
-				item.Title = backupList[i].Title
-				item.Content = content.String()
-				item.Images = images
-				item.Videos = videos
+				{
+					item.Title = backupList[i].Title
+					item.Content = content.String()
+					item.Images = images
+					item.Videos = videos
+				}
+
 			}
 			}
 		}
 		}
-		item.ChangeField = changeFiled
+		if len(changeFiled) > 0 {
+			item.ChangeField = changeFiled
+		} else {
+			item.Title = backupList[i].Title
+			item.Content = content.String()
+			item.Images = images
+			item.Videos = videos
+		}
 		resp.List[i] = item
 		resp.List[i] = item
 
 
 	}
 	}

@@ -134,7 +134,7 @@ func (repository *ArticleRepository) Find(ctx context.Context, conn transaction.
 			case "countLove descending":
 			case "countLove descending":
 				tx = tx.Order("count_love desc")
 				tx = tx.Order("count_love desc")
 			default:
 			default:
-				tx = tx.Order("id desc")
+				tx = tx.Order("created_at desc")
 			}
 			}
 		}
 		}
 		if v, ok := queryOptions["ids"]; ok {
 		if v, ok := queryOptions["ids"]; ok {