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

services/activity.go

@@ -757,6 +757,8 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	//如果权限不包含那么直接返回
 	if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 		return
+	} else {
+		havePower = true
 	}
 
 	//如果是 对用户的研选扣点的必须要有研选的正式权限

services/send_company_user.go

@@ -408,8 +408,8 @@ func DotongbuShangHaApi(condition string) (err error) {
 			companyFiccList[k].EndDate = strconv.Itoa(int(companyFiccList[k].EndDateTime.Unix()))
 			if len(mappermissionDataFicc[companyFiccList[k].Cid]) > 0 {
 				companyFiccList[k].PermissionData = mappermissionDataFicc[companyFiccList[k].Cid]
-			} else if len(mappermissionDataFiccNoChekcStatus[companyList[k].Cid]) > 0 {
-				companyFiccList[k].PermissionData = mappermissionDataFiccNoChekcStatus[companyList[k].Cid]
+			} else if len(mappermissionDataFiccNoChekcStatus[companyFiccList[k].Cid]) > 0 {
+				companyFiccList[k].PermissionData = mappermissionDataFiccNoChekcStatus[companyFiccList[k].Cid]
 			}
 			//一次同步一百条
 			companyFiccItems = append(companyFiccItems, companyFiccList[k])

utils/config.go

@@ -194,7 +194,7 @@ func init() {
 		EmailTechnology = "mlluo@hzinsights.com;jxu@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;hwang@hzinsights.com;rli@hzinsights.com"       //科技行业专家邮箱
 		EmailMedicine = "xlzheng@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;yxyan@hzinsights.com;ppwang@hzinsights.com"                       //医药行业专家邮箱
 		EmailConsumption = "yrhuang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jxu@hzinsights.com;hychen@hzinsights.com;lwang@hzinsights.com" //消费行业专家邮箱
-		EmailZhizao = "xfma@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                   //智造行业专家邮箱
+		EmailZhizao = "xfma@hzinsights.com;myyang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                 //智造行业专家邮箱
 		EmailStrategy = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                  //策略行业专家邮箱
 		EmailExpert = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                    //研选行业专家邮箱
 		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                                 //白名单邮箱