专家权限判断优化

controllers/activity.go

@@ -349,20 +349,25 @@ func (this *ActivityCoAntroller) Detail() {
 		}
 		//1专家电话会、2分析师电话会、3公司调研电话会、4公司线下调研、5专家线下沙龙、6分析师线下沙龙
 		//OperationMode     string `description:"操作方式 Apply:立即申请、Call:拨号 为空则为有权限"`
-		if activityInfo.ActivityTypeId != 1 && activityInfo.ActivityTypeId != 4 && permissionStr == "专家" {
-			resp.PopupMsg = "您暂无权限参加" + activityInfo.ActivityName + "类型活动，若想参加请联系对口销售--" + companyItem.SellerName + "：" + companyItem.Mobile
-			resp.SellerMobile = companyItem.Mobile
-			resp.OperationMode = "Call"
-			hasPermission = 2
+		if (activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家") {
+			hasPermission = 1
+			resp.HaqveJurisdiction = true
 		} else {
-			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
-				hasPermission = 1
-				resp.HaqveJurisdiction = true
-			} else {
-				resp.PopupMsg = "您暂无权限参加【" + activityInfo.ChartPermissionName + "】行业活动，若想参加请联系对口销售--" + companyItem.SellerName + "：" + companyItem.Mobile
+			if activityInfo.ActivityTypeId != 1 && activityInfo.ActivityTypeId != 4 && permissionStr == "专家" {
+				resp.PopupMsg = "您暂无权限参加" + activityInfo.ActivityName + "类型活动，若想参加请联系对口销售--" + companyItem.SellerName + "：" + companyItem.Mobile
 				resp.SellerMobile = companyItem.Mobile
 				resp.OperationMode = "Call"
 				hasPermission = 2
+			} else {
+				if strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
+					hasPermission = 1
+					resp.HaqveJurisdiction = true
+				} else {
+					resp.PopupMsg = "您暂无权限参加【" + activityInfo.ChartPermissionName + "】行业活动，若想参加请联系对口销售--" + companyItem.SellerName + "：" + companyItem.Mobile
+					resp.SellerMobile = companyItem.Mobile
+					resp.OperationMode = "Call"
+					hasPermission = 2
+				}
 			}
 		}
 	} else { //潜在客户
@@ -466,6 +471,10 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				return
 			}
 		}
+		if (activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家") {
+			hasPermission = 1
+			resp.HaqveJurisdiction = true
+		}
 		//1专家电话会、2分析师电话会、3公司调研电话会、4公司线下调研、5专家线下沙龙、6分析师线下沙龙
 		//OperationMode     string `description:"操作方式 Apply:立即申请、Call:拨号 为空则为有权限"`
 		if activityInfo.ActivityTypeId != 1 && activityInfo.ActivityTypeId != 4 && permissionStr == "专家" {
@@ -474,7 +483,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			resp.OperationMode = "Call"
 			hasPermission = 2
 		} else {
-			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
+			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) || ((activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家")) {
 				hasPermission = 1
 				signupStatus = "Success"
 				resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
@@ -906,7 +915,7 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 			resp.OperationMode = "Call"
 			hasPermission = 2
 		} else {
-			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
+			if strings.Contains(permissionStr, activityInfo.ChartPermissionName) || ((activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家")) {
 				hasPermission = 1
 				signupStatus = "Success"
 				totalMeeting, errMeeting := models.GetActivityMeetingReminderCount(uid, activityId)