浏览代码

no message

zhangchuanxing 1 周之前
父节点
当前提交
1db6688c5e
共有 1 个文件被更改,包括 18 次插入3 次删除
  1. 18 3
      controllers/cygx/summary_manage.go

+ 18 - 3
controllers/cygx/summary_manage.go

@@ -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 {