no message

controllers/activity.go

@@ -3802,7 +3802,6 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	isPower, _ := this.GetInt("IsPower")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	whichDay := this.GetString("WhichDay")
-	fmt.Println("whichDay:", whichDay)
 	typeName := this.GetString("TypeName")
 
 	//入参为 undefined 时的处理
@@ -3821,54 +3820,13 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		br.Data = resp
 		return
 	}
-	userType, permissionStr, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	//var startSize, pageSize int
-	//pageSize = 24
 	var condition string
+	var conditionSpecialinit string
 	var conditionSpecial string
 	var sortTime string
-	//var conditionStatus string
 	var pars []interface{}
-	//活动可见限制
-	var sqlExport string
-
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	for _, v := range slicePer {
-		if userType == 1 {
-			//if v != "研选" {
-			if !strings.Contains(v, "研选") {
-				permissionSqlStr += "'" + v + "',"
-			}
-		} else {
-			permissionSqlStr += "'" + v + "',"
-		}
-	}
-	permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
-	permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
-	permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
-	permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
-	sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-	if userType == 2 {
-		sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-	}
-	if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-		sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-	}
-	sqlExport += `) `
-
 	//已结束的活动
-	var conditionOr string
-	conditionOr = ""
 	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.active_state = 3 `
-	if isPower == 1 {
-		condition += permissionSqlStr + sqlExport + conditionOr
-	}
 	if whichDay != "" {
 		var startDate string
 		var endDate string
@@ -3897,23 +3855,31 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 
-		conditionSpecial += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-		conditionSpecial += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
+		conditionSpecialinit += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
+		conditionSpecialinit += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 
 	}
 	if len(chartPermissionIds) > 0 {
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
 	}
 
-	conditionActivity, err := services.GetActivityonditionList(user, typeName, chartPermissionIds, whichDay, "3", "", 0, 0, "", 0, 1)
+	// 如果是C类电话会就不展示内容，且合并到分析师电话会
+	if typeName == "1" || typeName == "2" {
+		if typeName == strconv.Itoa(utils.ANALYST_TELL_ACTIVITY_TYPE_ID) {
+			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + typeName + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
+		} else {
+			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + typeName + `)`
+		}
+		conditionSpecialinit += ` AND  art.activity_id = 0 `
+	}
+
+	conditionActivity, err := services.ActivityConditioninitSql(user, condition, isPower)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	//已结束的活动
 	sortTime = ` activity_time DESC `
-
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
 
 	companyDetail, err := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
@@ -3935,7 +3901,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)
+	list, err := models.GetActivityLabelListAllNoLimit(condition, sortTime, pars, conditionSpecialinit+conditionSpecial)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -3955,16 +3921,19 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		resp.List = append(resp.List, v)
 		mapKeyWord[keyWord] = keyWord
 	}
+	if len(list) == 0 {
+		resp.List = make([]*models.CygxActivityLabelList, 0)
+	}
 	//添加更多主题访问记录
-	item := new(models.CygxPageHistoryRecord)
-	item.UserId = user.UserId
-	item.CreateTime = time.Now()
-	item.Mobile = user.Mobile
-	item.Email = user.Email
-	item.CompanyId = user.CompanyId
-	item.CompanyName = user.CompanyName
-	item.PageType = "OverActivity"
-	go models.AddCygxPageHistoryRecord(item)
+	//item := new(models.CygxPageHistoryRecord)
+	//item.UserId = user.UserId
+	//item.CreateTime = time.Now()
+	//item.Mobile = user.Mobile
+	//item.Email = user.Email
+	//item.CompanyId = user.CompanyId
+	//item.CompanyName = user.CompanyName
+	//item.PageType = "OverActivity"
+	//go models.AddCygxPageHistoryRecord(item)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"