no message

controllers/activity_special.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/services"
@@ -49,6 +50,8 @@ func (this *ActivitySpecialController) SpecialList() {
 	}
 
 	conditionActivity := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
+
+	fmt.Println(conditionActivity)
 	list, total, errList := services.GetActivitySpecialList(user, currentIndex, pageSize, "", conditionActivity, activeState)
 	if errList != nil {
 		br.Msg = "获取失败"

services/activity_special.go

@@ -58,19 +58,19 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
 	if activeState == "2" {
-		condition += `  AND art.activity_time <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
+		condition += ` AND art.days > 0  AND art.activity_time <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 		condition += ` AND art.activity_time_end >= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}
 
 	if activeState == "3" {
-		condition += `   AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
+		condition += ` AND art.days > 0  AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}
 
 	//if activeState == "" && whichDay == "" {
 	//	condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	//}
 
-	if activeState != "" || whichDay != "" {
+	if whichDay != "" {
 		condition += `  AND art.days > 0  `
 	}
 
@@ -406,7 +406,7 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
 func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords, conditionActivity, activeState string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
 
 	state := 4
-	if activeState == "" {
+	if activeState == "3" {
 		state = 3
 	}