|
@@ -1241,17 +1241,24 @@ func (this *SummaryManage) ArticleHistoryExport() {
|
|
|
br.ErrMsg = "获取策略品台数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- var mobilesCl string
|
|
|
+ var mobilesArr []string
|
|
|
if len(listClPv) > 0 {
|
|
|
for _, v := range listClPv {
|
|
|
if v.Mobile != "" {
|
|
|
- mobilesCl += v.Mobile + ","
|
|
|
+ mobilesArr = append(mobilesArr, v.Mobile)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(list) > 0 {
|
|
|
+ for _, v := range list {
|
|
|
+ if v.Mobile != "" {
|
|
|
+ mobilesArr = append(mobilesArr, v.Mobile)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
mapMobileCompany := make(map[string]string)
|
|
|
mapMobileSellName := make(map[string]string)
|
|
|
- mobilesCl = strings.TrimRight(mobilesCl, ",")
|
|
|
+ mobilesCl := strings.Join(mobilesArr, ",")
|
|
|
|
|
|
if mobilesCl != "" {
|
|
|
listClCompanyName, err := cygx.GetCygxCelueArticleComapnyName(mobilesCl)
|
|
@@ -1279,6 +1286,14 @@ func (this *SummaryManage) ArticleHistoryExport() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ for _, v := range list {
|
|
|
+ if v.Mobile != "" {
|
|
|
+ if v.RealName == "" {
|
|
|
+ v.RealName = mapMobileSellName[v.Mobile]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
var listClPvPower []*cygx.ArticleHistoryRep
|
|
|
|
|
|
if len(mapMobileSellWithUser) != 0 {
|