Merge branch 'cygx_10.6' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -127,7 +127,8 @@ func (this *ActivityController) LabelTypeList() {
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	condition += ` AND art.is_limit_people = 1 ` + conditionActivity
+	//condition += ` AND art.is_limit_people = 1 ` + conditionActivity
+	condition += conditionActivity
 	sortTime := ` mintimesort ASC `
 	if activeState == "3" {
 		sortTime = ` timesort DESC  `

services/activity.go

@@ -1353,8 +1353,8 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		}
 		var keyword1 string
 		var keyword2 string
-		keyword1 = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：", sourceMsg)
-		keyword2 = activityDetail.ActivityName
+		keyword1 = activityDetail.ActivityName
+		keyword2 = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：", sourceMsg)
 		SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
 	}
 	return

services/es_comprehensive.go

@@ -1166,6 +1166,9 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 
 	for _, vList := range list {
 		for _, v := range mapItems {
+			if mapItems["Article"] == nil && mapItems["Newchart"] == nil && mapItems["Roadshow"] == nil && mapItems["Activity"] == nil && mapItems["Activityvideo"] == nil && mapItems["Activityvoice"] == nil && mapItems["Activityspecial"] == nil && mapItems["Researchsummary"] == nil && mapItems["Minutessummary"] == nil && mapItems["Meetingreviewchapt"] == nil && mapItems["ProductInterior"] == nil && mapItems["IndustrialResource"] == nil {
+				continue
+			}
 			if v.SourceId == vList.SourceId {
 				items = append(items, v)
 			}

services/wx_template_msg.go

@@ -349,17 +349,18 @@ func SendWxMsgWithActivityUserRemind(keyWord1, keyWord2 string, openIdList []*mo
 		msg = "accessToken is empty"
 		return
 	}
-	var first string
-	first = keyWord1
-	keyword1 := keyWord2
+	//var first string
+	//first = keyWord1
+	//keyword1 := keyWord2
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
 	sendMap := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	sendMap["template_id"] = templateId
 	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": "activityPages/activityDetail/activityDetail?id=" + strconv.Itoa(activityId)}
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
+	//sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
 	return
@@ -384,9 +385,9 @@ func SendWxMsgWithArticleUserRemind(keyWord1, keyWord2 string, openIdList []*mod
 		msg = "accessToken is empty"
 		return
 	}
-	var first string
-	first = keyWord1
-	keyword1 := keyWord2
+	//var first string
+	//first = keyWord1
+	//keyword1 := keyWord2
 	remark := "点击查看报告详情"
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
@@ -394,9 +395,9 @@ func SendWxMsgWithArticleUserRemind(keyWord1, keyWord2 string, openIdList []*mod
 	sendData := make(map[string]interface{})
 	sendMap["template_id"] = templateId
 	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleId)}
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["keyword2"] = map[string]interface{}{"value": "--", "color": "#173177"}
+	//sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(articleId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)