|
|
@@ -846,6 +846,20 @@ func (this *HomeController) NewList() {
|
|
|
if user.CompanyId <= 1 || totalRai == 0 {
|
|
|
//condition += " AND source IN ('roadshow','article') "
|
|
|
condition += " AND source NOT IN ('activityspecial') "
|
|
|
+ listActivityYiDong, err := models.GetActivityListHomeNew(" AND art.yidong_activity_id != '' ", 0, 1000)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //易董的活动不查看 v12.2.1
|
|
|
+ var yiDongactivityIds []int
|
|
|
+ for _, v := range listActivityYiDong {
|
|
|
+ yiDongactivityIds = append(yiDongactivityIds, v.ActivityId)
|
|
|
+ }
|
|
|
+ lenyiDongactivityIds := len(yiDongactivityIds)
|
|
|
+ condition += ` AND IF ( source = 'activity' , source_id NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
|
|
|
+ pars = append(pars, yiDongactivityIds)
|
|
|
} else {
|
|
|
condition += ` AND source NOT IN ('activity','activityspecial','newchart') ` + conditionInit
|
|
|
//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
|
|
|
@@ -938,7 +952,7 @@ func (this *HomeController) NewList() {
|
|
|
br.ErrMsg = "获取数据失败，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ return
|
|
|
//if user.Mobile == "" && user.Email == "" {
|
|
|
// total = pageSize
|
|
|
//}
|
xingzai