|
@@ -2325,6 +2325,19 @@ func (this *ReportController) SearchResource() {
|
|
br.Ret = 408
|
|
br.Ret = 408
|
|
return
|
|
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")
|
|
keyWord := this.GetString("KeyWord")
|
|
var condition string
|
|
var condition string
|
|
var conditionOr string
|
|
var conditionOr string
|
|
@@ -2362,17 +2375,17 @@ func (this *ReportController) SearchResource() {
|
|
listHz[k].IndustrialSubjectList = append(listHz[k].IndustrialSubjectList, v2)
|
|
listHz[k].IndustrialSubjectList = append(listHz[k].IndustrialSubjectList, v2)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if fllowMap[v.IndustrialManagementId] > 0 {
|
|
|
|
+ listHz[k].IsFollw = true
|
|
|
|
+ }
|
|
}
|
|
}
|
|
var IndustrialManagementIdStr string
|
|
var IndustrialManagementIdStr string
|
|
for k, v := range listYx {
|
|
for k, v := range listYx {
|
|
listYx[k].Source = 2
|
|
listYx[k].Source = 2
|
|
IndustrialManagementIdStr += "," + strconv.Itoa(v.IndustrialManagementId)
|
|
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, ",")
|
|
IndustrialManagementIdStr = strings.TrimLeft(IndustrialManagementIdStr, ",")
|
|
if IndustrialManagementIdStr != "" {
|
|
if IndustrialManagementIdStr != "" {
|