Merge branch 'cygx_9.5' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -2850,11 +2850,6 @@ func (this *ReportController) SearchReportAndResource() {
 		br.ErrMsg = "获取研选文章列表失败,Err:" + err.Error()
 		return
 	}
-	var articleIdsYx string
-	for _, v := range ListYxReport {
-		articleIdsYx = strconv.Itoa(v.ArticleId) + ","
-	}
-	articleIdsYx = strings.TrimRight(articleIdsYx, ",")
 	ListHzReport, err := models.GetReoprtSearchList(` AND a.article_type_id NOT IN (`+articleTypeIds+`) `+condition+sqlGroup, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -2881,9 +2876,7 @@ func (this *ReportController) SearchReportAndResource() {
 		} else {
 			sqlGroupIk += ` LIMIT 20 `
 		}
-		if articleIdsYx != "" {
-			conditionIk += " AND  a.article_id NOT IN(" + articleIdsYx + ")"
-		}
+		conditionIk += ` AND ( a.title NOT LIKE '%` + keyWord + `%' AND  a.body NOT LIKE '%` + keyWord + `%' AND  a.annotation NOT LIKE '%` + keyWord + `%' AND  a.abstract NOT LIKE '%` + keyWord + `%') `
 		//研选的联想词列表
 		ListYxReportIk, err := models.GetArticleCollectionList(` AND a.article_type_id IN (`+articleTypeIds+`) `+conditionIk+sqlGroupIk, user.UserId)
 		if err != nil && err.Error() != utils.ErrNoRow() {

controllers/research.go

@@ -482,8 +482,21 @@ func (this *ResearchController) DepartmentIdDetail() {
 		br.Msg = "请输入作者ID"
 		return
 	}
+	articleTypeIds, err := services.GetYanXuanArticleTypeIds()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetYanXuanArticleTypeIds,Err:" + err.Error()
+		return
+	}
+	if articleTypeIds == "" {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "研选分类ID不能为空"
+		return
+	}
+	var conditiondetail string
+	conditiondetail = ` AND a.article_type_id IN (` + articleTypeIds + `)  `
 	resp := new(models.DepartmentDetailResp)
-	detail, err := models.GetDepartmentDetail(user.UserId, departmentId)
+	detail, err := models.GetDepartmentDetail(user.UserId, departmentId, conditiondetail)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取作者信息失败,Err:" + err.Error()

models/report.go

@@ -797,7 +797,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,
@@ -805,8 +805,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