no message

models/company.go

@@ -151,8 +151,7 @@ func GetCompanyPermissionByUserZhengShi(companyId int) (permission string, err e
 			WHERE  a.company_id=?
 			AND c.is_suspend=0
             AND b.cygx_auth=1
-			AND c.status IN('正式')
-			AND a.status IN('正式') `
+			AND c.status IN('正式') `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return

services/activity.go

@@ -390,7 +390,7 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 				} else if permissionZhegnshiNum == 4 {
 					userType = 10
 				} else {
-					permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(companyId)
+					permissionShengji, errs := models.GetCompanyPermissionByUserZhengShi(companyId)
 					if errs != nil {
 						err = errs
 						return
@@ -729,6 +729,10 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		permissionZhengShiStr = strings.Replace(permissionZhengShiStr, "(客观)", "", -1)
 		permissionZhengShiStr = strings.TrimRight(permissionZhengShiStr, ",")
 		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%3%'	   AND art.chart_permission_name  IN (` + permissionZhengShiStr + `)` + condition + `) `
+
+		if userType == 9 {
+			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%9%'	   AND art.chart_permission_name  NOT  IN (` + permissionZhengShiStr + `)` + condition + `) `
+		}
 	}
 
 	// 8： 行业升级套餐客户：该活动对应行业为升级权限的客户
@@ -755,7 +759,6 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	}
 
 	conditionHz = condition
-
 	//活动仅决策人可见
 	if isMaker == 0 {
 		condition += ` AND art.is_maker_show = 0  `