Browse Source

no message

xingzai 1 năm trước cách đây
mục cha
commit
3304def812
1 tập tin đã thay đổi với 15 bổ sung4 xóa
  1. 15 4
      services/activity.go

+ 15 - 4
services/activity.go

@@ -578,6 +578,12 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		return
 	}
 	permissionStr += "," + utils.HONG_GUAN_NAME // 添加一个宏观权限
+	if permissionStrZhengShi == "" {
+		permissionStrZhengShi = utils.HONG_GUAN_NAME // 添加一个宏观权限
+	} else {
+		permissionStrZhengShi += "," + utils.HONG_GUAN_NAME // 添加一个宏观权限
+	}
+
 	//如果是易董的活动,主、副权限有一个满足即可
 	if activityInfo.YidongActivityId != "" {
 		if strings.Contains(permissionStr, activityInfo.ChartPermissionName) || strings.Contains(permissionStr, activityInfo.ChartPermissionNameDeputy) {
@@ -713,10 +719,15 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 			companyDetailStatus = companyDetail.Status
 		}
 	}
-	//if activityInfo.ChartPermissionId == 1 {
-	//	havePower = true
-	//	return
-	//}
+
+	//宏观满足用户可见身份验证权限既满足  2023-9-18
+	if activityInfo.ChartPermissionId == 1 {
+		if strings.Contains(activityInfo.CustomerTypeIds, userTypeStr) {
+			havePower = true
+			return
+		}
+	}
+
 	if (activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家") && activityInfo.LimitPeopleNum == 0 {
 		havePower = true
 	} else if activityInfo.ActivityTypeId == 3 && strings.Contains(permissionStr, "专家") && companyDetailStatus == "正式" && strings.Contains(activityInfo.CustomerTypeIds, "4") {