已结束活动标签展示可见规则修改

controllers/activity.go

@@ -4807,6 +4807,13 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		tempCondition = strings.TrimRight(tempCondition, ",")
 		condition += ` AND art.activity_type_name IN (` + tempCondition + `)`
 	}
+
+	conditionActivity, err := services.GetActivityonditionList(user, "", chartPermissionIds, whichDay, "3", "", 0, 0, "", 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+		return
+	}
 	//已结束的活动
 	sortTime = ` activity_time DESC `
 
@@ -4830,7 +4837,7 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	}
 	conditionSpecial += ` AND art.days >0  AND art.publish_status =1   AND art.is_offline = 0  `
 	conditionSpecial += ` AND art.activity_time_end <  ` + "'" + time.Now().Format(utils.FormatDateTime) + "'"
-
+	condition += conditionActivity
 	list, err := models.GetActivityLabelListAllNoLimit(condition, sortTime, pars, conditionSpecial)
 	if err != nil {
 		br.Msg = "获取失败"