no message

controllers/cygx/rai_serve.go

@@ -541,29 +541,35 @@ func getServeBillTag(tagType, tagId int) (conditionBill string, parsBill []inter
 		parsBill = append(parsBill, tagId)
 	}
 
+	activityIds = append(activityIds, 0)
 	lenactivityIds := len(activityIds)
-	if lenactivityIds > 0 {
-		conditionBill += ` AND IF ( source = 'activity', source_id IN  (` + utils.GetOrmInReplace(lenactivityIds) + `) , 1 = 1 ) `
-		parsBill = append(parsBill, activityIds)
-	}
+	//if lenactivityIds > 0 {
+	conditionBill += ` AND IF ( source = 'activity', source_id IN  (` + utils.GetOrmInReplace(lenactivityIds) + `) , 1 = 1 ) `
+	parsBill = append(parsBill, activityIds)
+	//}
 
+	activitySpecialIds = append(activitySpecialIds, 0)
 	lenactivitySpecialIds := len(activitySpecialIds)
-	if lenactivitySpecialIds > 0 {
-		conditionBill += ` AND IF ( source = 'activityspecial', source_id IN  (` + utils.GetOrmInReplace(lenactivitySpecialIds) + `) , 1 = 1 ) `
-		parsBill = append(parsBill, activitySpecialIds)
-	}
+	//if lenactivitySpecialIds > 0 {
+	conditionBill += ` AND IF ( source = 'activityspecial', source_id IN  (` + utils.GetOrmInReplace(lenactivitySpecialIds) + `) , 1 = 1 ) `
+	parsBill = append(parsBill, activitySpecialIds)
+	//}
 
+	articleIds = append(articleIds, 0)
 	lenarticleIds := len(articleIds)
-	if lenarticleIds > 0 {
-		conditionBill += ` AND IF ( source = 'article', source_id IN  (` + utils.GetOrmInReplace(lenarticleIds) + `) , 1 = 1 ) `
-		parsBill = append(parsBill, articleIds)
-	}
+	//if lenarticleIds > 0 {
+	conditionBill += ` AND IF ( source = 'article', source_id IN  (` + utils.GetOrmInReplace(lenarticleIds) + `) , 1 = 1 ) `
+	parsBill = append(parsBill, articleIds)
+	//}
 
+	rsCalendarIds = append(rsCalendarIds, 0)
 	lenrsCalendarIds := len(rsCalendarIds)
-	if lenrsCalendarIds > 0 {
-		conditionBill += ` AND IF ( source = 'rscalendar', source_id IN  (` + utils.GetOrmInReplace(lenrsCalendarIds) + `) , 1 = 1 ) `
-		parsBill = append(parsBill, rsCalendarIds)
-	}
+	//if lenrsCalendarIds > 0 {
+	conditionBill += ` AND IF ( source = 'rscalendar', source_id IN  (` + utils.GetOrmInReplace(lenrsCalendarIds) + `) , 1 = 1 ) `
+	parsBill = append(parsBill, rsCalendarIds)
+	//}
+
+	conditionBill += ` AND source != 'yanxuanspecial' `
 	return
 }
 
@@ -662,6 +668,7 @@ func (this *RaiServeCoAntroller) BillList() {
 		br.ErrMsg = "获取用户信息失败-getServeBillTag！Err:" + err.Error()
 		return
 	}
+
 	if whatWeek > 0 {
 		now := time.Now()
 		// 计算所选周的周一
@@ -740,6 +747,7 @@ func (this *RaiServeCoAntroller) BillList() {
 					v.Tag += "," + strings.Join(maparticleSubjectLabel[v.SourceId], ",")
 				}
 			case utils.CYGX_OBJ_ACTIVITY:
+
 				v.Tag = strings.Join(mapActivityIndustrialLabel[v.SourceId], ",")
 				if len(mapActivitySubjectLabel[v.SourceId]) > 0 {
 					v.Tag += "," + strings.Join(mapActivitySubjectLabel[v.SourceId], ",")