|
@@ -215,52 +215,23 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
|
|
|
condition += ` AND art.publish_status = 1 `
|
|
|
|
|
|
// 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, ",")
|
|
|
- conditionOr += ` OR ( art.is_limit_people = 1 AND art.customer_type_ids LIKE '%8%' AND art.chart_permission_name IN (` + permissionShengji + `)` + condition + `) `
|
|
|
- }
|
|
|
|
|
|
- //9:其他行业正式客户:前述所有正式客户以外的正式客户 查询处理
|
|
|
+ ////9:其他行业正式客户:前述所有正式客户以外的正式客户 查询处理
|
|
|
|
|
|
- permissionZhengShiStr, errs := models.GetCompanyPermissionByUserZhengShi(user.CompanyId)
|
|
|
- if errs != nil {
|
|
|
- err = errs
|
|
|
+ conditionShengji, conditionZhengshi, conditionHangYe, e := ActivityLabelSpecialUserSql(user)
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("ActivityLabelSpecialUserSql, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
- if permissionZhengShiStr != "" && userType == 9 {
|
|
|
- slicePerZhengshi := strings.Split(permissionZhengShiStr, ",")
|
|
|
- permissionZhengShiStr = ""
|
|
|
- for _, v := range slicePerZhengshi {
|
|
|
- if userType == 1 {
|
|
|
- //研选权限处理(永续客户无法查看研选)
|
|
|
- if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
- permissionZhengShiStr += "'" + v + "',"
|
|
|
- }
|
|
|
- } else {
|
|
|
- permissionZhengShiStr += "'" + v + "',"
|
|
|
- }
|
|
|
- }
|
|
|
- permissionZhengShiStr = strings.Replace(permissionZhengShiStr, "(主观)", "", -1)
|
|
|
- permissionZhengShiStr = strings.Replace(permissionZhengShiStr, "(客观)", "", -1)
|
|
|
- permissionZhengShiStr = strings.TrimRight(permissionZhengShiStr, ",")
|
|
|
- conditionOr += ` OR ( art.is_limit_people = 1 AND art.customer_type_ids LIKE '%9%' AND art.chart_permission_name NOT IN (` + permissionZhengShiStr + `)` + condition + `) `
|
|
|
+
|
|
|
+ if conditionShengji != "" {
|
|
|
+ conditionOr += ` OR ( art.is_limit_people = 1 AND ` + conditionShengji + condition + ` ) `
|
|
|
+ }
|
|
|
+ if conditionZhengshi != "" {
|
|
|
+ conditionOr += ` OR ( art.is_limit_people = 1 AND ` + conditionZhengshi + condition + ` ) `
|
|
|
+ }
|
|
|
+ if conditionHangYe != "" {
|
|
|
+ conditionOr += ` OR ( art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
|
|
|
}
|
|
|
|
|
|
conditionHz = condition
|