Merge branch 'master' into yx_1.1

# Conflicts:
#	controllers/yanxuan_special.go

controllers/home.go

@@ -74,8 +74,8 @@ func (this *HomeController) NewList() {
 		if labelKeyword == "" {
 			//查询近一个月的数据
 			condition += " AND search_order_time  >   '" + time.Now().AddDate(0, 0, -60).Format(utils.FormatDateTime) + "'"
-			yanxuanActivityIds = services.GetYanxuanActivityIds(user, 1) // 获取所有的研选活动ID
-			yanxuanArticleIds = services.GetYanxuanArticleIds()          //获取所有研选文章ID
+			yanxuanActivityIds = services.GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
+			yanxuanArticleIds = services.GetYanxuanArticleIds()              //获取所有研选文章ID
 		} else {
 			yanxuanActivityIds, yanxuanArticleIds, err = services.GetConditionInitByTagIds(user, labelKeyword)
 			if err != nil {

controllers/yanxuan_special.go

@@ -458,7 +458,7 @@ func (this *YanxuanSpecialController) Save() {
 		go services.EsAddYanxuanSpecial(specialId)                     //  写入es 综合搜索
 		go services.SendWxMsgSpecialFollow(req.Id)                     //研选专栏有新内容审核通过时，给关注此专栏的客户发送模板消息
 		go services.SendWxCategoryMsgSpecialFollow(req.Id)                     //研选专栏有新内容审核通过时，给关注此专栏的客户发送模板消息
-		go services.SendWxMsgSpecialAuthor(req.Id, 2)                  //研选专栏审核完成时，给提交人发送模板消息
+		go services.SendWxMsgSpecialAuthor(req.Id, 1)                  //研选专栏审核完成时，给提交人发送模板消息
 		go services.SendWxCategoryMsgSpecialAuthor(req.Id, 2)          //研选专栏审核完成时，给提交人发送类目模板消息
 		go services.UdpateYanxuanSpecialauthorArticleNum(authorUserId) //  更新作者发布文章的数量
 	} else {

services/activity.go

@@ -1329,7 +1329,7 @@ func GetActivityTypeIdMap() (mapResp map[int]int) {
 }
 
 // GetYanxuanActivityIds 获取研选活动ID
-func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityIds []int) {
+func GetYanxuanActivityIds(user *models.WxUserItem, activeState string) (activityIds []int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -1340,8 +1340,8 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
 	var condition string
 	var pars []interface{}
 	condition = `  AND  chart_permission_id  = 31  AND yidong_activity_id = '' AND art.publish_status = 1  `
-	if activeState > 0 {
-		condition += ` AND  active_state =` + strconv.Itoa(activeState)
+	if activeState != "" {
+		condition += ` AND  active_state IN  (` + activeState + `) `
 	}
 	//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 	if user.CompanyId > 1 {

services/es_comprehensive.go

@@ -649,8 +649,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 }
 
 func SqlComprehensiveSearch(user *models.WxUserItem, keyWord string, startSize, pageSize int) (result []*SearchComprehensiveItem, total int, err error) {
-	yanxuanActivityIds := GetYanxuanActivityIds(user, 0) // 获取所有的研选活动ID
-	yanxuanArticleIds := GetYanxuanArticleIds()          //获取所有研选文章ID
+	yanxuanActivityIds := GetYanxuanActivityIds(user, "") // 获取所有的研选活动ID
+	yanxuanArticleIds := GetYanxuanArticleIds()           //获取所有研选文章ID
 	yanxuanArticleIds = append(yanxuanArticleIds, 0)
 	yanxuanActivityIds = append(yanxuanActivityIds, 0)
 

services/tag.go

@@ -66,9 +66,9 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 	var pars []interface{}
 	switch labelKeyword {
 	case utils.LABEL_L1_1: // 全部活动
-		yanxuanActivityIds = GetYanxuanActivityIds(user, 1) // 获取所有的研选活动ID
+		yanxuanActivityIds = GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
 	case "买方交流": // 买方交流 ->买方线下交流
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8  AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8  AND  active_state IN (1,2) `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -79,7 +79,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 			yanxuanActivityIds = append(yanxuanActivityIds, v.ActivityId)
 		}
 	case "专家调研": // 专家调研->专家电话会+专家线下沙龙
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5)  AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5)  AND  active_state IN (1,2) `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -91,7 +91,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 		}
 
 	case "上市公司小范围": // 上市公司小范围->公司调研电话会
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3  AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3  AND  active_state IN (1,2) `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -130,7 +130,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 		//	}
 	}
 
-	yanxuanActivityIdsPerssion := GetYanxuanActivityIds(user, 1) // 获取所有有权限的研选活动ID
+	yanxuanActivityIdsPerssion := GetYanxuanActivityIds(user, "1,2") // 获取所有有权限的研选活动ID
 	mapyanxuanActivityIds := make(map[int]bool)
 	for _, v := range yanxuanActivityIdsPerssion {
 		mapyanxuanActivityIds[v] = true