Browse Source

研究研报告媒体风险等级筛选

kobe6258 6 months ago
parent
commit
aab76b1903
3 changed files with 8 additions and 5 deletions
  1. 1 1
      domian/media/media_service.go
  2. 2 2
      models/media/media.go
  3. 5 2
      service/media/media_service.go

+ 1 - 1
domian/media/media_service.go

@@ -131,7 +131,7 @@ func GetAnalystMediaPermissionMappingByPermissionIds(mediaType string, permissio
 		logger.Error("获取当前最大媒体id失败:%v", err)
 		return 0, 0, ids
 	}
-	ids, err = mediaDao.GetAnalystMediaRangeReportIds(ids, analystId)
+	ids, err = mediaDao.GetAnalystMediaRangeReportIds(mediaType, ids, analystId)
 	if err != nil {
 		logger.Error("根据研究员过滤媒体列表id失败:%v", err)
 		return 0, 0, ids

+ 2 - 2
models/media/media.go

@@ -105,13 +105,13 @@ func GetMediaPageByIds(latestId int64, limit int, offset int, mediaType string,
 	return
 }
 
-func GetAnalystMediaRangeReportIds(srcIds []int, analystId int) (mediaIds []int, err error) {
+func GetAnalystMediaRangeReportIds(mediaType string, srcIds []int, analystId int) (mediaIds []int, err error) {
 	if len(srcIds) == 0 {
 		logger.Info("过滤的媒体ID为空")
 		return
 	}
 	db := models.Main()
-	err = db.Model(&Media{}).Select(CommonColumns).Where(" id in ? and author_id = ?  and deleted =?", mediaIds, analystId, false).Find(&mediaIds).Error
+	err = db.Model(&Media{}).Select("id").Where(" id in ? and media_type= ?  and author_id = ?  and deleted =?", srcIds, mediaType, analystId, false).Find(&mediaIds).Error
 	return
 }
 func GetMediaPageByAnalystId(latestId int64, limit int, offset int, mediaType string, analystId int, mediaIds []int) (mediaList []Media, err error) {

+ 5 - 2
service/media/media_service.go

@@ -388,7 +388,10 @@ func GetMediaPageByAnalystId(mediaType string, pageInfo page.PageInfo, analystId
 		err = exception.New(exception.GetAnalystMediaListFailed)
 		return
 	}
-	list = make([]mediaService.MediaDTO, 0)
+	if len(list) == 0 {
+		logger.Info("研究员媒体列表为空")
+		return
+	}
 	//并发获取媒体的标签
 	var wg sync.WaitGroup
 	wg.Add(len(list))
@@ -406,7 +409,7 @@ func GetMediaPageByAnalystId(mediaType string, pageInfo page.PageInfo, analystId
 	}
 	wg.Wait()
 	if err != nil {
-		err = exception.New(exception.QueryReportPageFailed)
+		err = exception.New(exception.GetAnalystMediaListFailed)
 	}
 	return
 }