Merge branch 'CRM_14.5' into debug

controllers/company_user.go

@@ -5973,8 +5973,8 @@ func (this *CompanyUserController) Follow() {
 		return
 	}
 	if count == 3 && req.Type == 1 {
-		br.Msg = "关注失败，公司已达到关注上限 "
-		br.ErrMsg = "关注失败，公司已达到关注上限"
+		br.Msg = "关注失败，特别关注已达上限（上限三个）"
+		br.ErrMsg = "关注失败，特别关注已达上限（上限三个）"
 		return
 	}
 

models/company/company_user.go

@@ -141,7 +141,7 @@ func GetCompanyUserListV2(condition string, pars []interface{}, companyId, start
 		sql += condition
 	}
 	//sql += ` group by a.user_id ORDER BY a.is_register desc,a.report_last_view_time desc,a.last_updated_time DESC LIMIT ?,? `
-	sql += ` group by a.user_id ORDER BY CASE WHEN is_follow = 1 AND report_last_view_time < NOW()  - INTERVAL 7 DAY THEN 0 ELSE 1 END,a.is_register desc,a.report_last_view_time desc,a.last_updated_time DESC  LIMIT ?,? `
+	sql += ` group by a.user_id ORDER BY CASE WHEN is_follow = 1 AND report_last_view_time < NOW()  - INTERVAL 7 DAY THEN 0 ELSE 1 END,a.is_register desc,a.report_last_view_time ,a.last_updated_time   LIMIT ?,? `
 	_, err = o.Raw(sql, companyId, pars, startSize, pageSize).QueryRows(&items)
 	return
 }