no message

controllers/research.go

@@ -330,6 +330,7 @@ func (this *MobileResearchController) HotList() {
 	for k, v := range list {
 		list[k].IsNew = mapNew[v.IndustrialManagementId]
 		list[k].IsHot = mapHot[v.IndustrialManagementId]
+		list[k].PublishDate = utils.StrTimeToTime(v.PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
 		if v.FllowNum > 0 {
 			list[k].IsFollow = true
 		}
@@ -529,7 +530,7 @@ func (this *MobileResearchController) DepartmentIdDetail() {
 		return
 	}
 	resp := new(models.DepartmentDetailResp)
-	detail, err := models.GetDepartmentDetail(user.UserId, departmentId)
+	detail, err := models.GetDepartmentDetail(user.UserId, departmentId, condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取作者信息失败,Err:" + err.Error()
@@ -545,7 +546,7 @@ func (this *MobileResearchController) DepartmentIdDetail() {
 		resp.IsFollow = true
 	}
 
-	condition = `  AND a.department_id = ` + strconv.Itoa(departmentId)
+	condition += `  AND a.department_id = ` + strconv.Itoa(departmentId)
 	total, err := models.GetArticleResearchCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -740,7 +741,6 @@ func (this *MobileResearchController) Billboard() {
 		br.ErrMsg = "研选分类ID不能为空"
 		return
 	}
-	condition += `   AND a.article_type_id IN (` + articleTypeIds + `) `
 	// 根据关注时间一个月前至昨日的增量数据排序
 	nowTime := time.Now().Local()
 	startTime := nowTime.AddDate(0, -1, 0)
@@ -753,6 +753,7 @@ func (this *MobileResearchController) Billboard() {
 		br.ErrMsg = "获取报告阅读增量排行榜失败, Err:" + err.Error()
 		return
 	}
+
 	list, err = services.HandleArticleCategoryImg(list, user)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/article_department.go

@@ -129,7 +129,7 @@ type DepartmentDetail struct {
 }
 
 // 作者详情
-func GetDepartmentDetail(userId, departmentId int) (item DepartmentDetail, err error) {
+func GetDepartmentDetail(userId, departmentId int, condition string) (item DepartmentDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			d.department_id,
@@ -137,8 +137,8 @@ func GetDepartmentDetail(userId, departmentId int) (item DepartmentDetail, err e
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_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 ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id  ) AS article_num,
-			( SELECT count( 1 ) FROM cygx_article_collect  AS c INNER JOIN wx_user as u ON  u.user_id = c.user_id   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id )) AS collect_num
+			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` ) AS article_num,
+			( SELECT count( 1 ) FROM cygx_article_collect  AS c INNER JOIN wx_user as u ON  u.user_id = c.user_id   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
 		FROM
 			cygx_article_department AS d 
 		WHERE

models/report.go

@@ -359,11 +359,11 @@ func GetReportCollectionBillboardListYx(limit int, pars []interface{}, condition
 			INNER JOIN cygx_article_department AS d ON d.department_id = a.department_id 
 		WHERE
 			1 = 1 
-			AND a.publish_status = 1  AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId)
+			AND a.publish_status = 1  `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY a.article_id ORDER BY collection_num DESC, ac.id DESC, a.publish_date DESC`
+	sql += ` GROUP BY a.article_id ORDER BY collection_num DESC,  a.publish_date DESC`
 	sql += ` LIMIT ?`
 	_, err = o.Raw(sql, pars, limit).QueryRows(&items)
 	return