no message

controllers/activity.go

@@ -129,6 +129,12 @@ func (this *ActivityCoAntroller) ActivityList() {
 		//4、仅开通专家套餐的正式客户
 		//5、开通对应行业套餐或专家套餐的试用客户
 		if companyDetail.Status == "永续" {
+			permissionStr, err = models.GetCompanyPermission(user.CompanyId)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+				return
+			}
 			userType = 1
 		} else if companyDetail.Status == "试用" {
 			userType = 5
@@ -163,8 +169,17 @@ func (this *ActivityCoAntroller) ActivityList() {
 	var pars []interface{}
 	//活动可见限制
 	var sqlExport string
+
+	slicePer := strings.Split(permissionStr, ",")
+	var permissionSqlStr string
+	for _, v := range slicePer {
+		permissionSqlStr += "'" + v + "',"
+	}
+	permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
+	fmt.Println(permissionSqlStr)
+	permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
 	if userType == 3 && strings.Contains(permissionStr, "专家") {
-		sqlExport = `	OR ( is_limit_people = 1 OR  customer_type_ids LIKE '%4%' ) `
+		sqlExport = `	OR ( art.is_limit_people = 1 AND   art.customer_type_ids LIKE '%4%'   ` + permissionSqlStr + `) `
 	}
 
 	if keyWord != "" {
@@ -207,22 +222,18 @@ func (this *ActivityCoAntroller) ActivityList() {
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
-	condition += ` AND (art.is_limit_people = 0 OR(art.is_limit_people = 1 AND art.customer_type_ids LIKE'%` + strconv.Itoa(userType) + `%')  ` + sqlExport + `) `
+
+	condition += ` AND (art.is_limit_people = 0 OR(art.is_limit_people = 1 AND art.customer_type_ids LIKE'%` + strconv.Itoa(userType) + `%')  ` + sqlExport + permissionSqlStr + `) `
 	if activeState != "" {
 		condition += ` AND art.active_state  IN (` + activeState + `)`
 	}
 	var conditionOr string
 	if strings.Contains(permissionStr, "专家") {
-		conditionOr = `	OR (  art.publish_status = 1 ` + condition + `) `
+		conditionOr = `	OR ( art.activity_type_id IN ( 1,2,3 ) AND art.publish_status = 1 ` + condition + `) `
 	}
 	condition += ` AND art.publish_status = 1 `
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	for _, v := range slicePer {
-		permissionSqlStr += "'" + v + "',"
-	}
-	permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
-	condition += ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)` + conditionOr
+
+	condition += ` AND art.chart_permission_name  ` + permissionSqlStr + conditionOr
 	total, err := models.GetActivityCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"