Merge branch 'cygx_v2' of hongze/hongze_cygx into master

controllers/activity.go

@@ -129,6 +129,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
+
 		//1、永续客户
 		//2、大套餐客户（4个行业全开通的正式客户）
 		//3、分行业套餐客户（开通对应行业的正式客户）
@@ -164,18 +165,18 @@ func (this *ActivityCoAntroller) ActivityList() {
 	//活动可见限制
 	var sqlExport string
 
-	slicePer := strings.Split(permissionStr, ",")
+	//slicePer := strings.Split(permissionStr, ",")
 	var permissionSqlStr string
-	for _, v := range slicePer {
-		permissionSqlStr += "'" + v + "',"
-	}
-	permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
-	permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
+	//for _, v := range slicePer {
+	//	permissionSqlStr += "'" + v + "',"
+	//}
+	//permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
+	//permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
 	sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-	if userType == 1 || userType == 2 {
+	if userType == 2 {
 		sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
 	}
-	if (userType == 1 || userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
+	if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
 		sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
 	}
 	sqlExport += `) `
@@ -221,9 +222,9 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 	condition += ` AND art.publish_status = 1 `
 	var conditionOr string
-	if strings.Contains(permissionStr, "专家") && (userType == 1 || userType == 2 || userType == 3 || userType == 4) {
+	if strings.Contains(permissionStr, "专家") && (userType == 2 || userType == 3 || userType == 4) {
 		conditionOr = `	OR (  art.is_limit_people = 0 	AND art.activity_type_id IN ( 1,3 )  ` + condition + `) `
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	AND art.activity_type_id IN ( 1,3 )  ` + condition + `) `
+		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
 	}
 	conditionOr += `	OR ( art.is_limit_people = 0 	  ` + permissionSqlStr + condition + `) `
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr

utils/config.go

@@ -86,11 +86,17 @@ func init() {
 		IndexName = "cygx_article_v0712"
 
 		//接收附件邮箱
-		EmailTechnology = "mlluo@hzinsights.com; jxu@hzinsights.com; agne@hzinsights.com" //科技行业专家邮箱
-		EmailMedicine = "xlzheng@hzinsights.com"                                          //医药行业专家邮箱
-		EmailConsumption = "yrhuang@hzinsights.com"                                       //消费行业专家邮箱
-		EmailZhizao = "xfma@hzinsights.com; agne@hzinsights.com"                          //智造行业专家邮箱
-		EmailStrategy = "xfma@hzinsights.com"                                             //策略行业专家邮箱
+		//EmailTechnology = "mlluo@hzinsights.com; jxu@hzinsights.com; agne@hzinsights.com" //科技行业专家邮箱
+		//EmailMedicine = "xlzheng@hzinsights.com"                                          //医药行业专家邮箱
+		//EmailConsumption = "yrhuang@hzinsights.com"                                       //消费行业专家邮箱
+		//EmailZhizao = "xfma@hzinsights.com; agne@hzinsights.com"                          //智造行业专家邮箱
+		//EmailStrategy = "xfma@hzinsights.com"                                             //策略行业专家邮箱
+
+		EmailTechnology = "jhwang@hzinsights.com;cxzhang@hzinsights.com" //科技行业专家邮箱
+		EmailMedicine = "jhwang@hzinsights.com"                          //医药行业专家邮箱
+		EmailConsumption = "jhwang104@163.com;cxzhang@hzinsights.com"    //消费行业专家邮箱
+		EmailZhizao = "jhwang104@163.com;"                               //智造行业专家邮箱
+		EmailStrategy = "jhwang104@163.com;cxzhang@hzinsights.com"       //策略行业专家邮箱
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"