|
@@ -546,6 +546,10 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
|
|
|
err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
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) {
|
|
|
|
|
|
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
|
|
|
}
|
|
|
condition += ` AND art.publish_status = 1 `
|