|
@@ -493,10 +493,10 @@ func (this *ResearchController) DepartmentIdDetail() {
|
|
|
br.ErrMsg = "研选分类ID不能为空"
|
|
|
return
|
|
|
}
|
|
|
- var conditiondetail string
|
|
|
- conditiondetail = ` AND a.article_type_id IN (` + articleTypeIds + `) `
|
|
|
+ var condition string
|
|
|
+ condition = ` AND a.article_type_id IN (` + articleTypeIds + `) `
|
|
|
resp := new(models.DepartmentDetailResp)
|
|
|
- detail, err := models.GetDepartmentDetail(user.UserId, departmentId, conditiondetail)
|
|
|
+ detail, err := models.GetDepartmentDetail(user.UserId, departmentId, condition)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
br.ErrMsg = "获取作者信息失败,Err:" + err.Error()
|
|
@@ -511,8 +511,7 @@ func (this *ResearchController) DepartmentIdDetail() {
|
|
|
if detail.MyFllowNum > 0 {
|
|
|
resp.IsFllow = true
|
|
|
}
|
|
|
- var condition string
|
|
|
- condition = ` AND a.department_id = ` + strconv.Itoa(departmentId) + ` GROUP BY a.article_id ORDER BY a.publish_date DESC `
|
|
|
+ condition += ` AND a.department_id = ` + strconv.Itoa(departmentId) + ` GROUP BY a.article_id ORDER BY a.publish_date DESC `
|
|
|
list, err := models.GetArticleCollectionList(condition, user.UserId)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|