no message

services/cygx/acitvity.go

@@ -832,17 +832,6 @@ func IsShowAppointmentByadminSet(IsCanAppointmentMinutes int) (isShowAppointment
 
 // 处理活动是否进行模板消息推送
 func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
-	//10分钟之内的活动二次编辑不重复推送
-	cacheKey := fmt.Sprint("Source:ADMIN", "_ActivityId:", activityId)
-	isExist := utils.Rc.IsExist(cacheKey)
-	if isExist {
-		return err
-	}
-	setNX := utils.Rc.SetNX(cacheKey, activityId, time.Minute*10)
-	if !setNX {
-		go alarm_msg.SendAlarmMsg("发送模版消息失败，10分钟之内的活动二次编辑不重复推送，设置Redis Key 过期时间失败：key"+cacheKey, 3)
-		return err
-	}
 	var weekday string
 	weekday = time.Now().Weekday().String()
 	if weekday == "Sunday" {
@@ -866,6 +855,22 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 		return
 	}
 
+	if activityInfo.VisibleRange == 1 {
+		return //只要是仅对本组可见的活动，发布时，模板消息统一不发送， p2_876
+	}
+
+	//10分钟之内的活动二次编辑不重复推送
+	cacheKey := fmt.Sprint("Source:ADMIN", "_ActivityId:", activityId)
+	isExist := utils.Rc.IsExist(cacheKey)
+	if isExist {
+		return err
+	}
+	setNX := utils.Rc.SetNX(cacheKey, activityId, time.Minute*10)
+	if !setNX {
+		go alarm_msg.SendAlarmMsg("发送模版消息失败，10分钟之内的活动二次编辑不重复推送，设置Redis Key 过期时间失败：key"+cacheKey, 3)
+		return err
+	}
+
 	var chartPermissionIds string
 	var chartPermissionName string
 	//专家权限可以查看以参加以下活动的类型 1：专家电话会 、3：公司调研电话会、4：公司线下调研、5：专家线下沙龙

services/cygx/activity_permission.go

@@ -18,7 +18,7 @@ func GetAdminActivityPermission(adminInfo *system.Admin, condition string) (cond
 	}
 	var adminidStr string
 	adminidStr = strings.Join(adminIdArr, ",")
-	conditionPermission = ` OR (art.activity_type_id = 7 AND  visible_range = 1 AND art.admin_id IN (` + adminidStr + `) ` + condition + `) `
+	conditionPermission = ` OR ( visible_range = 1 AND art.admin_id IN (` + adminidStr + `) ` + condition + `) `
 	//conditionPermission += ` OR (art.activity_type_id = 7 AND  visible_range != 1  ` + condition + `) `
 	return
 }