xingzai 2 lat temu
rodzic
commit
1697416a40
2 zmienionych plików z 19 dodań i 15 usunięć
  1. 5 5
      controllers/micro_roadshow.go
  2. 14 10
      controllers/report.go

+ 5 - 5
controllers/micro_roadshow.go

@@ -423,20 +423,20 @@ func (this *MicroRoadShowController) CommentAdd() {
 			br.ErrMsg = "活动ID错误,不存在activityId:" + strconv.Itoa(req.Id)
 			return
 		}
-		item.ActivityId = req.Id
+		item.ActivityId = activityVoiceInfo.ActivityId
 		item.Title = activityVoiceInfo.VoiceName
 		item.ActivityVoiceId = activityVoiceInfo.ActivityVoiceId
 		resourceId = activityVoiceInfo.ActivityId
 	} else if sourceType == 2 {
-		activityInfo, _ := models.GetCygxActivityVideoByActivityId(req.Id)
+		activityInfo, _ := models.GetCygxActivityVideoById(req.Id)
 		if activityInfo == nil {
 			br.Msg = "操作失败"
 			br.ErrMsg = "活动ID错误,不存在activityId:" + strconv.Itoa(req.Id)
 			return
 		}
-		item.Title = activityInfo.VideoName
-		item.VideoId = activityInfo.VideoId
-		item.ActivityId = req.Id
+		item.Title = activityInfo.Title
+		item.VideoId = activityInfo.Id
+		item.ActivityId = activityInfo.ActivityId
 		resourceId = activityInfo.ActivityId
 	} else if sourceType == 3 {
 		item.VideoId = req.Id

+ 14 - 10
controllers/report.go

@@ -1078,17 +1078,21 @@ func (this *MobileReportController) SearchResource() {
 		return
 	}
 
-	listYx, err = services.HandleIndustryList(listYx, user, "Yx")
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
+	if len(listYx) > 0 {
+		listYx, err = services.HandleIndustryList(listYx, user, "Yx")
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
 	}
-	listHz, err = services.HandleIndustryList(listHz, user, "Hz")
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
+	if len(listHz) > 0 {
+		listHz, err = services.HandleIndustryList(listHz, user, "Hz")
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
 	}
 	if keyWord != "" {
 		go services.AddUserSearchLog(user, keyWord, 4)