no message

controllers/cygx/summary_manage.go

@@ -7,6 +7,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/services"
@@ -1105,6 +1106,28 @@ func (this *SummaryManage) ArticleCollection() {
 		br.ErrMsg = "获取列表失败，Err:" + err.Error()
 		return
 	}
+
+	//获取对应销售名称
+	if len(list) > 0 {
+		var companyIds []int
+		for _, v := range list {
+			companyIds = append(companyIds, v.CompanyId)
+		}
+		listCompanyProduct, err := company.GetCompanyProductListByCompanyIds(companyIds, 2)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取销售列表失败，Err:" + err.Error()
+			return
+		}
+		mapSellName := make(map[int]string)
+		for _, v := range listCompanyProduct {
+			mapSellName[v.CompanyId] = v.SellerName
+		}
+		for _, v := range list {
+			v.SellerName = mapSellName[v.CompanyId]
+		}
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/company/company_product.go

@@ -645,3 +645,15 @@ func GetCompanyProductItemByCompanyId(companyId int, productId int) (items *Comp
 
 	return
 }
+
+// GetCompanyProductListByCompanyIds 根据客户id集合以及类型获取所有客户产品列表
+func GetCompanyProductListByCompanyIds(companyIds []int, productId int) (items []*CompanyProduct, err error) {
+	lenArr := len(companyIds)
+	if lenArr == 0 {
+		return
+	}
+	sql := `SELECT * FROM company_product WHERE  1= 1 AND company_id IN  (` + utils.GetOrmInReplace(lenArr) + `)` + ` AND    product_id  = ?`
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, companyIds, productId).QueryRows(&items)
+	return
+}

models/cygx/article_department.go

@@ -82,6 +82,7 @@ func GetCygxArticleDepartmentList(condition string) (items []*CygxArticleDepartm
 type CygxDepartmentFllowList struct {
 	RealName    string `description:"姓名"`
 	CompanyName string `description:"公司名称"`
+	CompanyId   int    `description:"公司Id"`
 	SellerName  string `description:"公司名称"`
 	CreateTime  string `description:"创建时间"`
 }