|
@@ -118,12 +118,6 @@ func (r *ReportController) List(permissionIds string) {
|
|
|
r.SuccessResult("查询报告列表成功", reports, result)
|
|
|
return
|
|
|
}
|
|
|
- //if len(permissionIdList) == 0 && len(reportOrgIds) > 0 {
|
|
|
- // err = exception.New(exception.UnknownError)
|
|
|
- // r.FailedResult("查询报告列表失败", result)
|
|
|
- // return
|
|
|
- //}
|
|
|
-
|
|
|
list, err := report.GetReportPage(r.PageInfo, reportOrgIds, false, isLogin(detailType))
|
|
|
if err != nil {
|
|
|
r.FailedResult("分页查询报告列表失败", result)
|
|
@@ -202,7 +196,7 @@ func (r *ReportController) HotRanked(permissionIds string, limit int) {
|
|
|
}
|
|
|
} else {
|
|
|
for _, item := range list {
|
|
|
- for _, permissionId := range permissionIdList {
|
|
|
+ for _, permissionId := range permissionIdsWithRisk {
|
|
|
if _, ok := item.SecondPermissions[permissionId]; ok {
|
|
|
filterList = append(filterList, item)
|
|
|
break
|
|
@@ -280,7 +274,7 @@ func (r *ReportController) PublishRanked(permissionIds string, limit int, week b
|
|
|
}
|
|
|
} else {
|
|
|
for _, item := range list {
|
|
|
- for _, permissionId := range permissionIdList {
|
|
|
+ for _, permissionId := range permissionIdsWithRisk {
|
|
|
if _, ok := item.SecondPermissions[permissionId]; ok {
|
|
|
filterList = append(filterList, item)
|
|
|
break
|