Merge branch 'feature/8.4_industry_video' into debug

controllers/report.go

@@ -290,6 +290,8 @@ func (this *ReportController) IndustryList() {
 				BackgroundImg: v.ImgUrl,
 				PlaySeconds:   v.VideoDuration,
 				DetailImgUrl:  v.DetailImgUrl,
+				ChartPermissionId: v.ChartPermissionId,
+				ChartPermissionName: v.ChartPermissionName,
 			}
 			if tmp.BackgroundImg == "" {
 				tmp.BackgroundImg = videoMap[v.ChartPermissionId]
@@ -349,30 +351,31 @@ func (this *ReportController) IndustryList() {
 			}
 		}
 
-		//控制用户权限
-		// 权限
-		au := new(models.UserPermissionAuthInfo)
-		au.SellerName = authInfo.SellerName
-		au.SellerMobile = authInfo.SellerMobile
-		au.HasPermission = authInfo.HasPermission
-		au.OperationMode = authInfo.OperationMode
-		if au.HasPermission == 1 {
-			// 非宏观权限进一步判断是否有权限
-			if list[k].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[k].PermissionName) {
-				au.HasPermission = 2
-			}
-		}
-		// 无权限的弹框提示
-		if au.HasPermission != 1 {
-			if au.OperationMode == services.UserPermissionOperationModeCall {
-				au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
-			} else {
-				au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
-			}
-		}
-		list[k].AuthInfo = au
 		//展示产业视频
 		if video, ok := industrialVideoMap[v.IndustrialManagementId]; ok {
+			//控制用户权限
+			// 权限
+			au := new(models.UserPermissionAuthInfo)
+			au.SellerName = authInfo.SellerName
+			au.SellerMobile = authInfo.SellerMobile
+			au.HasPermission = authInfo.HasPermission
+			au.OperationMode = authInfo.OperationMode
+			if au.HasPermission == 1 {
+				// 非宏观权限进一步判断是否有权限
+				if video.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, video.ChartPermissionName) {
+					au.HasPermission = 2
+				}
+			}
+			// 无权限的弹框提示
+			if au.HasPermission != 1 {
+				if au.OperationMode == services.UserPermissionOperationModeCall {
+					au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
+				} else {
+					au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
+				}
+				video.ResourceUrl = ""
+			}
+			list[k].AuthInfo = au
 			list[k].IndustryVideo = video
 		}
 
@@ -513,6 +516,7 @@ func (this *ReportController) ArticleCategoryList() {
 			} else {
 				au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
 			}
+			videoSimple.ResourceUrl = ""
 		}
 	}
 
@@ -2931,7 +2935,6 @@ func (this *ReportController) SearchReportAndResource() {
 		for k, v := range listHzResource {
 			//展示产业视频
 			if video, ok := industrialVideoMap[v.IndustrialManagementId]; ok {
-				listHzResource[k].IndustryVideo = video
 				au := new(models.UserPermissionAuthInfo)
 				au.SellerName = authInfo.SellerName
 				au.SellerMobile = authInfo.SellerMobile
@@ -2950,8 +2953,10 @@ func (this *ReportController) SearchReportAndResource() {
 					} else {
 						au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
 					}
+					video.ResourceUrl = ""
 				}
 				listHzResource[k].AuthInfo = au
+				listHzResource[k].IndustryVideo = video
 			}
 		}