研选更换承买方研选之后的权限处理判断，以及对应的邮件附件发送

controllers/activity.go

@@ -150,7 +150,8 @@ func (this *ActivityCoAntroller) ActivityList() {
 	var permissionSqlStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionSqlStr += "'" + v + "',"
 			}
 		} else {
@@ -331,11 +332,11 @@ func (this *ActivityCoAntroller) ActivityList() {
 		if v.SignupNum > v.LimitPeopleNum {
 			list[k].SignupNum = v.LimitPeopleNum
 		}
-		if isShow && v.ChartPermissionName == "研选" {
+		if isShow && strings.Contains(v.ChartPermissionName, "研选") {
 			list[k].IsShowSustainable = true
 		}
-		if v.ChartPermissionName == "研选" && v.ActivityTypeId == 1 {
-			list[k].ActivityTypeName = "研选电话会"
+		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
+			list[k].ActivityTypeName = "买方研选电话会"
 			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 		}
 		if v.ActivityType == 0 {
@@ -504,11 +505,11 @@ func (this *ActivityCoAntroller) ScheduleList() {
 			list[k].SignupNum = v.LimitPeopleNum
 		}
 		//是否展示限免标签
-		if isShow && v.ChartPermissionName == "研选" {
+		if isShow && strings.Contains(v.ChartPermissionName, "研选") {
 			list[k].IsShowSustainable = true
 		}
-		if v.ChartPermissionName == "研选" && v.ActivityTypeId == 1 {
-			list[k].ActivityTypeName = "研选电话会"
+		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
+			list[k].ActivityTypeName = "买方研选电话会"
 			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 		}
 		if v.ActivityType == 0 {
@@ -688,7 +689,7 @@ func (this *ActivityCoAntroller) Detail() {
 		}
 	}
 
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -804,7 +805,7 @@ func (this *ActivityCoAntroller) Detail() {
 	}
 	if hasPermission == 1 {
 		//是否展示限免标签
-		if services.GetShowSustainable() && activityInfo.ChartPermissionName == "研选" {
+		if services.GetShowSustainable() && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 			activityInfo.IsShowSustainable = true
 		}
 		configCode := "description_of_research"
@@ -978,7 +979,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -1480,7 +1481,8 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	var listChartPermissionidNew2 []*models.ActivityChartPermission
 	for _, v := range list2 {
 		if userType == 1 {
-			if v.PermissionName != "研选" {
+			//if v.PermissionName != "研选" {
+			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
 			}
 		} else {
@@ -1491,7 +1493,7 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	var listChartPermissionidNew []*models.ActivityChartPermission
 	for _, v := range listChartPermissionid {
 		if userType == 1 {
-			if v.PermissionName != "研选" {
+			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew = append(listChartPermissionidNew, v)
 			}
 		} else {
@@ -1631,7 +1633,7 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -1928,7 +1930,8 @@ func (this *ActivityCoAntroller) LabelList() {
 	var permissionSqlStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionSqlStr += "'" + v + "',"
 			}
 		} else {
@@ -2270,7 +2273,8 @@ func (this *ActivityCoAntroller) LabelTypeList() {
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionNameStr += "'" + v + "',"
 			}
 		} else {
@@ -2469,7 +2473,8 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 	var permissionSqlStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionSqlStr += "'" + v + "',"
 			}
 		} else {
@@ -2640,7 +2645,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	var permissionSqlStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionSqlStr += "'" + v + "',"
 			}
 		} else {
@@ -2787,11 +2793,11 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		if v.SignupNum > v.LimitPeopleNum {
 			list[k].SignupNum = v.LimitPeopleNum
 		}
-		if isShow && v.ChartPermissionName == "研选" {
+		if isShow && strings.Contains(v.ChartPermissionName, "研选") {
 			list[k].IsShowSustainable = true
 		}
-		if v.ChartPermissionName == "研选" && v.ActivityTypeId == 1 {
-			list[k].ActivityTypeName = "研选电话会"
+		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
+			list[k].ActivityTypeName = "买方研选电话会"
 			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 		}
 		if v.ActivityType == 0 {
@@ -2890,7 +2896,8 @@ func (this *ActivityCoAntroller) LabelTypeListPc() {
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionNameStr += "'" + v + "',"
 			}
 		} else {
@@ -3130,7 +3137,7 @@ func (this *ActivityCoAntroller) CheckAsk() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -3265,7 +3272,8 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionNameStr += "'" + v + "',"
 			}
 		} else {
@@ -3527,7 +3535,8 @@ func (this *ActivityCoAntroller) SpecialList() {
 	var permissionSqlStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionSqlStr += "'" + v + "',"
 			}
 		} else {
@@ -3797,7 +3806,7 @@ func (this *ActivityCoAntroller) SpecialDetail() {
 		return
 	}
 
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -4023,7 +4032,7 @@ func (this *ActivityCoAntroller) SpecialSignupAdd() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return
@@ -4281,7 +4290,8 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 	var permissionNameStr string
 	for _, v := range slicePer {
 		if userType == 1 {
-			if v != "研选" {
+			//if v != "研选" {
+			if !strings.Contains(v, "研选") {
 				permissionNameStr += "'" + v + "',"
 			}
 		} else {
@@ -4427,8 +4437,8 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 	itemList.Resource = 2
 	itemList.List = specialList
 	itemList.ActivityTypeId = 7
-	itemList.OnlineIco = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211224/Yq5Ty2DCKTP5N8SdwcYHHTGvTgaS.png"
-	itemList.ImgUrlBgPc = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211224/FTPPvpNfILLOGSoV4Ddcc0gIuNEW.png"
+	itemList.OnlineIco = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/0H4md6VgZMuIttggMUnJxgrlayxC.png"
+	itemList.ImgUrlBgPc = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/rFwAM1c4fIMJM0EGoUkUYl25XH9L.png"
 	list = append(list, itemList)
 	//记录用户搜索的筛选条件
 	item := new(models.CygxActivitySearchHistory)
@@ -4584,7 +4594,7 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if userType == 1 && activityInfo.ChartPermissionName == "研选" {
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, "研选") {
 		br.Msg = "您暂无查看该活动权限"
 		br.ErrMsg = "被分享客户不可见，永续客户无法查看研选行业"
 		return

controllers/home.go

@@ -89,9 +89,9 @@ func (this *HomeController) ListHome() {
 		page = paging.GetPaging(currentIndex, pageSize, total)
 		if categoryId != "" {
 			condition += ` AND category_id IN(` + categoryId + `)`
-			condition += ` OR ( category_name  LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 AND is_summary = 1 )`
+			condition += ` OR ( category_name LIKE '%研选%' AND publish_status = 1 AND is_summary = 1 )`
 		} else {
-			condition += ` AND  category_name   LIKE '%` + categoryinfo.PermissionName + `%'`
+			condition += ` AND  category_name  LIKE '%研选%' `
 		}
 	}
 	//永续客户无法查看研选分类的内容

services/activity.go

@@ -242,7 +242,7 @@ func SendEmailFileToExpert(cont context.Context) (err error) {
 			touser = utils.EmailZhizao
 		} else if activityInfo.ChartPermissionName == "策略" {
 			touser = utils.EmailStrategy
-		} else if activityInfo.ChartPermissionName == "研选" {
+		} else if strings.Contains(activityInfo.ChartPermissionName, "研选") {
 			touser = utils.EmailExpert
 		}
 		sendResult := utils.SendEmailByHongze(title, content, touser, fileName, title+".xlsx")
@@ -410,7 +410,7 @@ func GetHavePower(activityInfo *models.ActivityDetail, permissionStr, companyDet
 			havePower = true
 		}
 	}
-	if (activityInfo.ChartPermissionName == "研选" || activityInfo.ChartPermissionName == "策略") && strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
+	if (strings.Contains(activityInfo.ChartPermissionName, "研选") || activityInfo.ChartPermissionName == "策略") && strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 		havePower = true
 	}
 	return
@@ -431,7 +431,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 		}
 	}()
 	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
-	condition := `AND  a.activity_type_id = 1 AND a.chart_permission_name = '研选' `
+	condition := `AND  a.activity_type_id = 1 AND a.chart_permission_id = 31 `
 	total, err := models.GetCountActivityResearchToSendFile(condition, endDate)
 	if total == 0 {
 		fmt.Println("发送附件完成0")
@@ -507,7 +507,7 @@ func SendEmailFileForAskMsg(cont context.Context) (err error) {
 		}
 	}()
 	endDate := time.Now().Add(+time.Minute * 15).Format(utils.FormatDateTime)
-	condition := `AND  a.activity_type_id = 1 AND  a.chart_permission_name != '研选' `
+	condition := `AND  a.activity_type_id = 1 AND  a.chart_permission_id != 31 `
 	total, err := models.GetCountActivityResearchToSendFile(condition, endDate)
 	if total == 0 {
 		fmt.Println("发送附件完成0")