no message

controllers/activity.go

@@ -2733,7 +2733,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if source == 1 {
 		condition += ` AND art.yidong_activity_id = '' `
 	}
-	condition += ` AND art.is_limit_people = 1 ` + conditionActivity
+	condition += ` AND art.is_limit_people = 1 AND art.publish_status = 1 ` + conditionActivity
 	total, err := models.GetActivityCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

services/activity.go

@@ -461,7 +461,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	var condition string
 	var conditionAdmin string
 	var sqlExport string // 专家权限处理
-	permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionNameStr + `)`
+	permissionSqlStr = `  AND art.chart_permission_name  IN (` + permissionNameStr + `)`
 	sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
 	if userType == 2 {
 		sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
@@ -525,7 +525,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	}
 	conditionAdmin = condition
 	//查询全部可见的数据（是否全部客户可见）
-	condition += ` AND art.visible_range != 1  `
+	condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
 
 	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
 		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `