no message

services/activity.go

@@ -1892,6 +1892,10 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
 	var condition string
 	var pars []interface{}
 	condition = `  AND  chart_permission_id  = 31  AND yidong_activity_id = '' AND art.publish_status = 1  `
+	if activeState > 0 {
+		condition += ` AND  active_state = ?   `
+		pars = append(pars, activeState)
+	}
 	//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 	if user.CompanyId > 1 {
 		conditionActivity, e := ActivityConditioninitSql(user, condition, 0)
@@ -1901,12 +1905,6 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
 		}
 		condition += conditionActivity
 	}
-
-	if activeState > 0 {
-		condition += ` AND  active_state = ?   `
-		pars = append(pars, activeState)
-	}
-
 	condition += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
 	list, e := models.GetCygxActivityListPage(condition, pars, 0, 2000)
 	if e != nil {