no message

controllers/company.go

@@ -2846,7 +2846,14 @@ func (this *CompanyController) Add() {
 	if productId == utils.COMPANY_PRODUCT_RAI_ID {
 		permissionArr := strings.Split(req.PermissionIds, ",")
 		//如果所选行业不属于研选订阅跟研选扣点包，那就是非研选试用客户
-		if !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)) && !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID)) {
+		var isNoResearch bool
+		for _, v := range permissionArr {
+			if v != strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) && v != strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID) {
+				isNoResearch = true
+				continue
+			}
+		}
+		if isNoResearch {
 			tryOutCountRai, err := company.GetRaiCompanyTryOutCountNoResearch(seller.AdminId)
 			if err != nil {
 				br.Msg = "判断试用客户量失败"
@@ -3951,7 +3958,14 @@ func (this *CompanyController) Edit() {
 			}
 			permissionArr := strings.Split(v.PermissionIds, ",")
 			//如果所选行业不属于研选订阅跟研选扣点包，那就是非研选试用客户
-			if !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)) && !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID)) && len(companyReportPermissionListOld) != len(permissionArr) {
+			var isNoResearch bool
+			for _, v := range permissionArr {
+				if v != strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) && v != strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID) {
+					isNoResearch = true
+					continue
+				}
+			}
+			if isNoResearch && len(companyReportPermissionListOld) != len(permissionArr) {
 				tryOutCountRai, err := company.GetRaiCompanyTryOutCountNoResearch(sysUser.AdminId)
 				if err != nil {
 					br.Msg = "判断试用客户量失败"
@@ -4944,12 +4958,15 @@ func (this *CompanyController) Receive() {
 			br.ErrMsg = "查询客户的产品权限异常:" + err.Error()
 			return
 		}
-		var permissionArr []string
+		var isNoResearch bool
 		for _, v := range companyReportPermissionListOld {
-			permissionArr = append(permissionArr, strconv.Itoa(v.ChartPermissionId))
+			if v.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && v.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				isNoResearch = true
+				continue
+			}
 		}
 		//如果所选行业不属于研选订阅跟研选扣点包，那就是非研选试用客户
-		if !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)) && !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID)) {
+		if isNoResearch {
 			tryOutCountRai, err := company.GetRaiCompanyTryOutCountNoResearch(req.SellsId)
 			if err != nil {
 				br.Msg = "判断试用客户量失败"
@@ -5223,12 +5240,15 @@ func (this *CompanyController) MoveSeller() {
 			br.ErrMsg = "查询客户的产品权限异常:" + err.Error()
 			return
 		}
-		var permissionArr []string
+		var isNoResearch bool
 		for _, v := range companyReportPermissionListOld {
-			permissionArr = append(permissionArr, strconv.Itoa(v.ChartPermissionId))
+			if v.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && v.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				isNoResearch = true
+				continue
+			}
 		}
 		//如果所选行业不属于研选订阅跟研选扣点包，那就是非研选试用客户
-		if !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)) && !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID)) {
+		if isNoResearch {
 			tryOutCountRai, err := company.GetRaiCompanyTryOutCountNoResearch(req.SellsId)
 			if err != nil {
 				br.Msg = "判断试用客户量失败"

controllers/company_apply_v2.go

@@ -1467,7 +1467,14 @@ func (this *CompanyApplyController) ApplyThaw() {
 
 		permissionArr := strings.Split(req.PermissionIds, ",")
 		//如果所选行业不属于研选订阅跟研选扣点包，那就是非研选试用客户
-		if !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)) && !utils.InArrayByStr(permissionArr, strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID)) {
+		var isNoResearch bool
+		for _, v := range permissionArr {
+			if v != strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) && v != strconv.Itoa(utils.YAN_XUAN_KOU_DIAN_BAO_ID) {
+				isNoResearch = true
+				continue
+			}
+		}
+		if isNoResearch {
 			tryOutCountRai, err := company.GetRaiCompanyTryOutCountNoResearch(sysUser.AdminId)
 			if err != nil {
 				br.Msg = "判断试用客户量失败"