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

services/activity.go

@@ -348,7 +348,7 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 			} else if companyDetail.Status == "试用" {
 				userType = 5
 			} else if companyDetail.Status == "正式" {
-				userType = 0
+				//userType = 0
 				//if permissionStr == "专家" {
 				//	userType = 4
 				//}
@@ -397,6 +397,8 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 					}
 					if permissionShengji != "" {
 						userType = 9
+					} else {
+						userType = 3
 					}
 				}
 			}
@@ -711,7 +713,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		err = errs
 		return
 	}
-	//3:该活动对应行业为正式状态的客户 查询处理
+	//9:其他行业正式客户：前述所有正式客户以外的正式客户 查询处理
 	if permissionZhengShiStr != "" {
 		slicePerZhengshi := strings.Split(permissionZhengShiStr, ",")
 		permissionZhengShiStr = ""
@@ -728,7 +730,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		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 '%3%'	   AND art.chart_permission_name  IN (` + permissionZhengShiStr + `)` + condition + `) `
+		//conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%3%'	   AND art.chart_permission_name  IN (` + permissionZhengShiStr + `)` + condition + `) `
 
 		if userType == 9 {
 			conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%9%'	   AND art.chart_permission_name  NOT  IN (` + permissionZhengShiStr + `)` + condition + `) `