标的排序

models/article_department.go

@@ -86,19 +86,20 @@ func GetCygxArticleDepartmentList(startSize, pageSize int, condition string, uid
 func GetIndustrialSubjectByDepartment(departmentId int) (items []*IndustrialManagementIdInt, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-m.*,
-	(SELECT  GROUP_CONCAT(DISTINCT s.subject_name   SEPARATOR '/')  FROM cygx_industrial_subject as s  WHERE s.industrial_management_id = m.industrial_management_id  LIMIT 0,3) AS subject_name ,
-	( SELECT publish_date FROM cygx_article AS a INNER JOIN cygx_industrial_article_group_management as mg ON mg.article_id = a.article_id  ORDER BY publish_date DESC LIMIT 1  ) AS art_time
-FROM
-	cygx_article_department AS d
-	INNER JOIN cygx_article AS a ON a.department_id = d.department_id
-	INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
-	INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
-	WHERE 1= 1
-	AND 	d.department_id = ?
-	GROUP BY m.industrial_management_id
-	ORDER BY art_time DESC
-	LIMIT 4 `
+			m.*,
+			( SELECT GROUP_CONCAT(DISTINCT s.subject_name ORDER BY s.create_time DESC SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id) AS subject_name,
+			( SELECT publish_date FROM cygx_article AS a INNER JOIN cygx_industrial_article_group_management as mg ON mg.article_id = a.article_id  ORDER BY publish_date DESC LIMIT 1  ) AS art_time
+		FROM
+			cygx_article_department AS d
+			INNER JOIN cygx_article AS a ON a.department_id = d.department_id
+			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
+			WHERE 1= 1
+			AND d.department_id = ?
+			AND a.publish_status = 1
+			GROUP BY m.industrial_management_id
+			ORDER BY art_time DESC
+			LIMIT 4 `
 	_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	return
 }