no message

controllers/company_seller.go

@@ -155,6 +155,7 @@ func (this *CompanySellerController) CheckList() {
 // @Param   AllSeller   query   bool  true       "是否获取部门所有的销售信息"
 // @Param   Status   query   int  true       "客户状态 1：流失 0：非流失"
 // @Param   AllEnabled   query   bool  true       "是否获取包含禁用的用户"
+// @Param   CompanyType   query   string  true       "客户类型：传空字符串或者不传为全部,'ficc','权益'"
 // @Success 200 {object} company.DepartmentGroupSellersResp
 // @router /seller/check/listV2 [get]
 func (this *CompanySellerController) CheckListV2() {
@@ -170,9 +171,12 @@ func (this *CompanySellerController) CheckListV2() {
 		br.Ret = 408
 		return
 	}
-
+	companyType := this.GetString("CompanyType") // 单独获取权益或者FICC的销售人员 CRM14.2
 	roleCodeTypeStr := ``
 	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if companyType == "权益" {
+		productId = 2
+	}
 	switch productId {
 	case 1:
 		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_FICC_SELLER + `","` + utils.ROLE_TYPE_CODE_FICC_GROUP + `","` + utils.ROLE_TYPE_CODE_FICC_TEAM + `"`

controllers/statistic_company_merge.go

@@ -74,6 +74,10 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 
 	isConfirm, _ := this.GetInt("IsConfirm", -1)
 	companyAscribeId, _ := this.GetInt("CompanyAscribeId", -1)
+
+	if dataType != "续约客户" {
+		packageDifference = "" // 只有续约客户才会有值，过滤前端传过来的脏数据
+	}
 	//if startDate == "" || endDate == "" {
 	//	br.Msg = "获取失败，开始日期或结束日期未传"
 	//	br.ErrMsg = "获取失败，开始日期或结束日期未传"
@@ -442,6 +446,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			list[i].ExpireDay = expireDay
 		}
 	}
+
 	if dataType == "新签客户" || dataType == "续约客户" {
 		//合并合同所对应的权限
 		mappermissionName, err := services.GetCompanyContractPermissionNameMapById(mapCompamy)

services/company_contract.go

@@ -107,6 +107,9 @@ func InitCompanyContractMerge() {
 }
 
 func GetCompanyContractPermissionNameMapById(mapCompamy map[int]string) (mapContractResp map[int]string, err error) {
+	if len(mapCompamy) == 0 {
+		return
+	}
 	var condition string
 	var pars []interface{}
 
@@ -169,7 +172,7 @@ func GetCompanyContractPermissionNameMapById(mapCompamy map[int]string) (mapCont
 		}
 	}
 
-	//过滤主客观权限
+	//合并客观权限
 	for k, v := range mapContractIdPerssion {
 		perssionName := v
 		if strings.Count(v, utils.YI_YAO_NAME) == 2 {
@@ -196,8 +199,17 @@ func GetCompanyContractPermissionNameMapById(mapCompamy map[int]string) (mapCont
 		mapContractResp[mapContracIdCompanyId[k]] += v + ","
 	}
 
+	//过滤多余的","
 	for k, v := range mapContractResp {
-		mapContractResp[k] = strings.TrimRight(v, ",")
+		sliceName := strings.Split(v, ",")
+		var nameArr []string
+		for _, vName := range sliceName {
+			if vName == "" {
+				continue
+			}
+			nameArr = append(nameArr, vName)
+		}
+		mapContractResp[k] = strings.Join(nameArr, ",")
 	}
 	return
 }