fix

controllers/micro_roadshow.go

@@ -81,14 +81,14 @@ func (this *MicroRoadShowController) List() {
 		au.SellerMobile = authInfo.SellerMobile
 		au.HasPermission = authInfo.HasPermission
 		au.OperationMode = authInfo.OperationMode
-		if authInfo.HasPermission == 1 {
+		if au.HasPermission == 1 {
 			// 非宏观权限进一步判断是否有权限
 			if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
 				au.HasPermission = 2
 			}
 		}
 		// 无权限的弹框提示
-		if authInfo.HasPermission != 1 {
+		if au.HasPermission != 1 {
 			if au.OperationMode == services.UserPermissionOperationModeCall {
 				if list[i].Type == 1 {
 					au.PopupMsg = services.UserPermissionPopupMsgCallActivity

services/micro_roadshow.go

@@ -294,14 +294,14 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 			au.SellerMobile = authInfo.SellerMobile
 			au.HasPermission = authInfo.HasPermission
 			au.OperationMode = authInfo.OperationMode
-			if authInfo.HasPermission == 1 {
+			if au.HasPermission == 1 {
 				// 非宏观权限进一步判断是否有权限
 				if ad.AudioChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, ad.AudioChartPermissionName) {
 					au.HasPermission = 2
 				}
 			}
 			// 无权限的弹框提示
-			if authInfo.HasPermission != 1 {
+			if au.HasPermission != 1 {
 				if au.OperationMode == UserPermissionOperationModeCall {
 					if ad.AudioType == 1 {
 						au.PopupMsg = UserPermissionPopupMsgCallActivity

services/user_permission.go

@@ -52,6 +52,13 @@ func GetUserRaiPermissionInfo(userId, companyId int) (authInfo models.UserPermis
 		authInfo.SellerMobile = raiSeller.Mobile
 		authInfo.SellerName = raiSeller.RealName
 	}
+	// 仅有FICC权限(也视作无权限)
+	if ficcSeller != nil && raiSeller == nil {
+		authInfo.HasPermission = 2
+		authInfo.OperationMode = UserPermissionOperationModeApply
+		authInfo.PopupMsg = UserPermissionPopupMsgApplyActivity
+		return
+	}
 
 	// permissions示例: 医药,消费,科技,智造,策略,专家,买方研选
 	permissions, e := models.GetCompanyPermission(companyId)
@@ -60,13 +67,6 @@ func GetUserRaiPermissionInfo(userId, companyId int) (authInfo models.UserPermis
 		return
 	}
 	if permissions == "" {
-		// 仅有FICC权限(也视作无权限)
-		if ficcSeller != nil && raiSeller == nil {
-			authInfo.HasPermission = 2
-			authInfo.OperationMode = UserPermissionOperationModeApply
-			authInfo.PopupMsg = UserPermissionPopupMsgApplyActivity
-			return
-		}
 		// 无权益权限
 		if raiSeller != nil {
 			// 有销售信息