Переглянути джерело

7.0PC联调,补充作者详情页面字段

xingzai 2 роки тому
батько
коміт
51e333c58d
1 змінених файлів з 19 додано та 6 видалено
  1. 19 6
      controllers/report.go

+ 19 - 6
controllers/report.go

@@ -2325,6 +2325,19 @@ func (this *ReportController) SearchResource() {
 		br.Ret = 408
 		return
 	}
+	uid := user.UserId
+	fllowList, err := models.GetUserFllowIndustrialList(uid)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,GetUserFllowIndustrialList Err:" + err.Error()
+		return
+	}
+	fllowMap := make(map[int]int)
+	if len(fllowList) > 0 {
+		for _, v := range fllowList {
+			fllowMap[v.IndustrialManagementId] = v.IndustrialManagementId
+		}
+	}
 	keyWord := this.GetString("KeyWord")
 	var condition string
 	var conditionOr string
@@ -2362,17 +2375,17 @@ func (this *ReportController) SearchResource() {
 				listHz[k].IndustrialSubjectList = append(listHz[k].IndustrialSubjectList, v2)
 			}
 		}
+		if fllowMap[v.IndustrialManagementId] > 0 {
+			listHz[k].IsFollw = true
+		}
 	}
 	var IndustrialManagementIdStr string
 	for k, v := range listYx {
 		listYx[k].Source = 2
 		IndustrialManagementIdStr += "," + strconv.Itoa(v.IndustrialManagementId)
-		//for _, v2 := range listSubjcet {
-		//	if v2.IndustrialManagementId == v.IndustrialManagementId {
-		//		listYx[k].IndustrialSubjectList = append(listYx[k].IndustrialSubjectList, v2)
-		//	}
-		//}
-
+		if fllowMap[v.IndustrialManagementId] > 0 {
+			listYx[k].IsFollw = true
+		}
 	}
 	IndustrialManagementIdStr = strings.TrimLeft(IndustrialManagementIdStr, ",")
 	if IndustrialManagementIdStr != "" {