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

services/activity_special.go

@@ -224,28 +224,6 @@ func HandleActivityLabelSpecialTripPermission(user *models.WxUserItem) (conditio
 	condition += ` AND  art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
 
 	//if userType != 2 {
-	// 8： 行业升级套餐客户：该活动对应行业为升级权限的客户
-	permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(user.CompanyId)
-	if errs != nil {
-		err = errs
-		return
-	}
-	if permissionShengji != "" {
-		slicePerShengji := strings.Split(permissionShengji, ",")
-		permissionShengji = ""
-		for _, v := range slicePerShengji {
-			if userType == 1 {
-				//研选权限处理(永续客户无法查看研选)
-				if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
-					permissionShengji += "'" + v + "',"
-				}
-			} else {
-				permissionShengji += "'" + v + "',"
-			}
-		}
-		permissionShengji = strings.TrimRight(permissionShengji, ",")
-		condition += ` OR (  art.customer_type_ids LIKE '%8%' AND art.chart_permission_name  IN (` + permissionShengji + `)` + condition + `) `
-	}
 
 	return
 }
@@ -344,6 +322,23 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
 		condition += ` AND art.research_theme LIKE ? `
 		pars = append(pars, keywords)
 	}
+	// 8： 行业升级套餐客户：该活动对应行业为升级权限的客户
+	permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(user.CompanyId)
+	if errs != nil {
+		err = errs
+		return
+	}
+	if permissionShengji != "" {
+		slicePerShengji := strings.Split(permissionShengji, ",")
+		permissionShengji = ""
+		for _, v := range slicePerShengji {
+			permissionShengji += "'" + v + "',"
+		}
+		permissionShengji = strings.TrimRight(permissionShengji, ",")
+		condition += ` OR (  art.customer_type_ids LIKE '%8%' AND art.chart_permission_name  IN (` + permissionShengji + `)` + condition + `) `
+	}
+	pars = append(pars, pars)
+
 	totalConfirm, e = models.GetActivitySpecialCount(condition, pars)
 	if e != nil {
 		err = errors.New("GetActivitySpecialCount, Err: " + e.Error())