no message

services/activity.go

@@ -500,7 +500,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	var userTypeStr string
 
 	//如果是弘则的用户或者宏观的权限不做校验
-	if GetBelongingRai(user.Mobile) || activityInfo.ChartPermissionName == utils.HONG_GUAN_NAME {
+	if (GetBelongingRai(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID) || activityInfo.ChartPermissionName == utils.HONG_GUAN_NAME {
 		havePower = true
 		return
 	}

services/activity_points.go

@@ -296,7 +296,6 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	}()
 
 	activityId := log.ActivityId
-	comapnyId := log.ComapnyId
 
 	//获取活动是否扣点以及扣点规则明细
 	activityPointsSetDetail, e := models.GetCygxActivityPointsSetDetail(activityId)
@@ -310,10 +309,10 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	if activityPointsSetDetail.CompanyPointsNum == 0 {
 		return // 如果不是办会人，即扣点的这种形式，那么就不做任何处理
 	}
-
-	activityInfo, e := models.GetAddActivityInfoById(activityId)
+	comapnyId := activityPointsSetDetail.CompanyId
+	activityInfo, e := models.GetAddActivityInfoByActivityId(activityId)
 	if e != nil {
-		err = errors.New("GetAddActivityInfoById" + e.Error())
+		err = errors.New("GetAddActivityInfoByActivityId" + e.Error())
 		return
 	}
 	if activityInfo.PublishStatus == 0 {
@@ -336,7 +335,7 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	var condition string
 	var pars []interface{}
 	condition += ` AND activity_id = ? AND company_id = ? AND user_id = 0   ORDER BY id DESC LIMIT 1  `
-	pars = append(pars, activityId)
+	pars = append(pars, activityId, comapnyId)
 	activityPointsBillDetail, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyPoints, Err: " + e.Error())

services/task.go

@@ -126,8 +126,8 @@ func Task() {
 		task.AddTask("getArticleListByApi", getArticleListByApi)
 	}
 
-	go UserLabelLogReduce()              // 处理用户标签的队列消息
-	go YanXuanActivityPointsBillReduce() // 处理研选活动扣点
+	go UserLabelLogReduce() // 处理用户标签的队列消息
+	//go YanXuanActivityPointsBillReduce() // 处理研选活动扣点
 	//GetCygxActivityAttendanceDetail()
 	//CreateIndexNameArticleHistory()
 	//AddAllArticleHistory()