Merge branch 'cygx_need_908' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -650,18 +650,18 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	//SignupStatus "报名状态：人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 	//HasPermission "1:有该行业权限,正常展示，2：无该行业权限，3：潜在客户，未提交过申请，4：潜在客户,已提交过申请"`
 
-	var userType int
-	userType, _, err = services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取信息失败！"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
-		br.Msg = "您暂无查看该活动权限"
-		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
-		return
-	}
+	//var userType int
+	//userType, _, err = services.GetUserType(user.CompanyId)
+	//if err != nil {
+	//	br.Msg = "获取信息失败！"
+	//	br.ErrMsg = "获取失败，Err:" + err.Error()
+	//	return
+	//}
+	//if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
+	//	br.Msg = "您暂无查看该活动权限"
+	//	br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
+	//	return
+	//}
 	item := new(models.CygxActivitySignup)
 
 	// 判断是否属于研选类型的活动

controllers/banner.go

@@ -121,7 +121,8 @@ func (this *BannerController) ListYx() {
 
 	if utils.RunMode == "release" {
 		listA = []*models.BannerUrlYxResp{
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
+			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
+			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_1.png"},
 			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
 			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4.png", Path: "pages-purchaser/specialColumn/specialColumn"},
 			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3_long.png", Path: "pages-purchaser/researchList/researchList"},
@@ -132,7 +133,8 @@ func (this *BannerController) ListYx() {
 		}
 	} else {
 		listA = []*models.BannerUrlYxResp{
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
+			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
+			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_1.png"},
 			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
 			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3_long.png", Path: "pages-purchaser/researchList/researchList"},
 		}

models/activity.go

@@ -723,6 +723,7 @@ func GetActivityIdToSendFile(endDate string) (items []*ActivityIdRep, err error)
 			AND t.activity_type = 1
 			AND s.fail_type = 0 
 			AND a.is_send_file_toemail = 0 
+		 	AND a.publish_status = 1
 			AND a.activity_time <= ? AND a.activity_time >= NOW() 	GROUP BY a.activity_id `
 	_, err = o.Raw(sql, endDate).QueryRows(&items)
 	return

models/article.go

@@ -584,6 +584,7 @@ type ArticleResultApidate struct {
 	Cover         string                   `json:"cover"`
 	TypeId        int                      `json:"type_id"`
 	IsActive      bool                     `json:"is_active"`
+	PublishArea   string                   `json:"publish_area"`
 }
 
 type ArticleField struct {

services/article.go

@@ -788,8 +788,8 @@ func HandleArticleListByApi(artcleId int) (err error) {
 	var list []*models.Tactics2
 	var listArticleData []*models.CygxArticleData
 	var listAuthor []*models.CygxArticleAuthor
-	//如果是英文报告那么则不同步
-	if articleResult.TypeId == 9 {
+	//如果是英文报告 ,或者香港类型那么则不同步  publish_area   ：all  全部  ;hk 香港
+	if articleResult.TypeId == 9 || articleResult.PublishArea != "all" {
 		return
 	}