Merge branch 'cygx_9.3.1_0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_special.go

@@ -284,14 +284,15 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
 	}
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
 	var condition string
+	var conditionUser string
 	if companyDetail.Status == "永续" {
-		condition, e = HandleActivityLabelSpecialPermission(user)
+		conditionUser, e = HandleActivityLabelSpecialPermission(user)
 		if e != nil {
 			err = errors.New("HandleActivityLabelSpecialPermission, Err: " + e.Error())
 			return
 		}
 	} else {
-		condition, e = HandleActivityLabelSpecialTripPermission(user)
+		conditionUser, e = HandleActivityLabelSpecialTripPermission(user)
 		if e != nil {
 			err = errors.New("HandleActivityLabelSpecialPermission, Err: " + e.Error())
 			return
@@ -338,7 +339,7 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
 		condition += ` OR (  art.customer_type_ids LIKE '%8%' AND art.chart_permission_name  IN (` + permissionShengji + `)` + condition + `) `
 	}
 	pars = append(pars, pars)
-
+	condition += conditionUser
 	totalConfirm, e = models.GetActivitySpecialCount(condition, pars)
 	if e != nil {
 		err = errors.New("GetActivitySpecialCount, Err: " + e.Error())