|
@@ -546,6 +546,10 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
|
|
err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
|
|
err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ //如果权限不包含那么直接返回
|
|
|
|
+ if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
//如果是 公司调研电话会:3,或 专家线下沙龙:5 而且 除易董同步过来的以外的研选类型活动,必须要有研选的正式权限
|
|
//如果是 公司调研电话会:3,或 专家线下沙龙:5 而且 除易董同步过来的以外的研选类型活动,必须要有研选的正式权限
|
|
if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
isResearchSpecial = true
|
|
isResearchSpecial = true
|
|
@@ -1151,7 +1155,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
|
|
func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
|
|
func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
|
|
// cygx_10.9 未绑定联系方式的客户可以看到部分活动
|
|
// cygx_10.9 未绑定联系方式的客户可以看到部分活动
|
|
if user.UserId == 0 || user.CompanyId == 1 {
|
|
if user.UserId == 0 || user.CompanyId == 1 {
|
|
- conditionActivity = ` AND art.publish_status = 1 AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1)) ` + condition
|
|
|
|
|
|
+ conditionActivity = ` AND art.publish_status = 1 AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1)) ` + condition
|
|
return
|
|
return
|
|
}
|
|
}
|
|
condition += ` AND art.publish_status = 1 `
|
|
condition += ` AND art.publish_status = 1 `
|