|
@@ -557,6 +557,24 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
|
|
|
havePower = true
|
|
|
return
|
|
|
}
|
|
|
+ if activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 7 {
|
|
|
+ if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(主观)") {
|
|
|
+ havePower = true
|
|
|
+ } else {
|
|
|
+ havePower = false
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(客观)") {
|
|
|
+ havePower = true
|
|
|
+ } else {
|
|
|
+ havePower = false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //如果主客观校验不通过,那么直接返回
|
|
|
+ if !havePower {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
if activityInfo.LimitPeopleNum > 0 {
|
|
|
mapUserType, e := GetActivityCcustomerTypeList()
|
|
|
if e != nil {
|
|
@@ -640,23 +658,6 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 7 {
|
|
|
- if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(主观)") {
|
|
|
- havePower = true
|
|
|
- } else {
|
|
|
- havePower = false
|
|
|
- }
|
|
|
- } else {
|
|
|
- if strings.Contains(permissionStr, activityInfo.ChartPermissionName+"(客观)") {
|
|
|
- havePower = true
|
|
|
- } else {
|
|
|
- havePower = false
|
|
|
- }
|
|
|
- }
|
|
|
- //如果主客观校验不通过,那么直接返回
|
|
|
- if !havePower {
|
|
|
- return
|
|
|
- }
|
|
|
|
|
|
permissionShengji, errs := models.GetCompanyPermissionByUserTrip(user.CompanyId)
|
|
|
if errs != nil {
|