|
@@ -2823,6 +2823,8 @@ func (this *ReportController) SearchReportAndResource() {
|
|
|
sqlGroup = ` GROUP BY a.article_id ORDER BY a.publish_date DESC `
|
|
|
if pageSize > 0 {
|
|
|
sqlGroup += ` LIMIT 5 `
|
|
|
+ } else {
|
|
|
+ pageSize = 100
|
|
|
}
|
|
|
ListYxReport, err := models.GetArticleCollectionList(` AND a.article_id >= 1000000 `+condition+sqlGroup, user.UserId)
|
|
|
if err != nil {
|
|
@@ -3086,7 +3088,6 @@ func (this *ReportController) StockNameList() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//index := strings.Index(item.Stock, "(")
|
|
|
//item.Stock = item.Stock[:index]
|
|
|
//if strings.Contains(item.Stock, "-B"){
|