|
@@ -309,19 +309,65 @@ func (this *ActivityController) ActivityListNew() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ //用户权限
|
|
|
+ authInfo, permissionArr, e := services.GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取用户权限失败, Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
for k, v := range list {
|
|
|
+
|
|
|
+ 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 v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
|
|
|
+ au.HasPermission = 2
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 无权限的弹框提示
|
|
|
+ if au.HasPermission != 1 {
|
|
|
+ if au.OperationMode == services.UserPermissionOperationModeCall {
|
|
|
+ if v.FileType == 1 {
|
|
|
+ au.PopupMsg = services.UserPermissionPopupMsgCallActivity
|
|
|
+ } else {
|
|
|
+ au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if v.FileType == 1 {
|
|
|
+ au.PopupMsg = services.UserPermissionPopupMsgApplyActivity
|
|
|
+ } else {
|
|
|
+ au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list[k].AuthInfo = au
|
|
|
+ }
|
|
|
+
|
|
|
if mapActivityVoice[v.ActivityId] != nil {
|
|
|
list[k].FileType = 1
|
|
|
list[k].AudioLink = true
|
|
|
- list[k].VoiceList = mapActivityVoice[v.ActivityId]
|
|
|
+ if au.HasPermission == 1 {
|
|
|
+ list[k].VoiceList = mapActivityVoice[v.ActivityId]
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if mapActivityVideo[v.ActivityId] != nil {
|
|
|
list[k].FileType = 2
|
|
|
list[k].AudioLink = true
|
|
|
- list[k].VideoDetail = mapActivityVideo[v.ActivityId]
|
|
|
+ if au.HasPermission == 1 {
|
|
|
+ list[k].VideoDetail = mapActivityVideo[v.ActivityId]
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
//fmt.Println(v)
|
|
|
activityList = append(activityList, services.ActivityButtonShow(v, user))
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
|