no message

controllers/research.go

@@ -174,9 +174,9 @@ func (this *ResearchController) HotList() {
 	}
 	condition = ` AND a.article_type_id IN (` + articleTypeIds + `)  `
 	if themeType == 2 {
-		conditionOrder = `ORDER BY publish_date DESC `
+		conditionOrder = `ORDER BY publish_date DESC  `
 	} else {
-		conditionOrder = `ORDER BY sum_num DESC `
+		conditionOrder = `ORDER BY sum_num DESC   `
 	}
 
 	total, err := models.GetThemeHeatListCount(condition)
@@ -288,7 +288,7 @@ func (this *ResearchController) KolList() {
 	}
 
 	if themeType == 2 {
-		conditionOrder = `ORDER BY publish_date DESC `
+		conditionOrder = `ORDER BY publish_date DESC , last_updated_time  DESC `
 	} else {
 		conditionOrder = `ORDER BY sum_num DESC `
 	}

models/report.go

@@ -512,7 +512,7 @@ func GetThemeHeatList(userId int, condition, conditionOrder string, startSize, p
           	MAX( a.publish_date ) AS publish_date,
 			MIN(a.publish_date) AS min_report_time,
 			( SELECT count( 1 ) FROM cygx_industry_fllow AS f  WHERE f.industrial_management_id = m.industrial_management_id  AND user_id =? AND f.type = 1  ) AS fllow_num,
-			m.article_read_num + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  ) AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( la.activity_time ) ) AS sum_num
+			( SELECT count( 1 ) FROM cygx_industry_fllow AS f  WHERE f.industrial_management_id = m.industrial_management_id  AND f.type = 1  ) AS sum_num
 		FROM
 			cygx_industrial_management AS m
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id
@@ -520,7 +520,7 @@ func GetThemeHeatList(userId int, condition, conditionOrder string, startSize, p
 			LEFT JOIN cygx_industrial_activity_group_management as ag ON ag.industrial_management_id = mg.industrial_management_id
 		WHERE
 			1 = 1
-			AND publish_status = 1  ` + condition + ` GROUP BY m.industrial_management_id ` + conditionOrder + ` LIMIT ?,?`
+			AND publish_status = 1  ` + condition + `  GROUP BY m.industrial_management_id ` + conditionOrder + ` , last_updated_time  DESC LIMIT ?,?`
 	_, err = o.Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -595,16 +595,15 @@ func GetDepartmentList(condition, conditionOrder string, userId, startSize, page
 			d.img_url,
 			MAX( a.publish_date ) AS publish_date,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND user_id =?  AND f.type= 1  ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id ) 	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS sum_num
+			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND  f.type= 1  ) AS sum_num
 		FROM
 		cygx_article_department AS d
 			INNER JOIN cygx_article AS a ON d.department_id = a.department_id
 		WHERE
 			1 = 1
-			AND a.article_type_id > 0 
 			AND publish_status = 1  ` + condition + `
 		GROUP BY
-				d.department_id ` + conditionOrder + ` LIMIT ?,?`
+				d.department_id ` + conditionOrder + ` , last_updated_time  DESC LIMIT ?,?`
 	_, err = o.Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return
 }