Browse Source

Merge branch 'dev_v1.0.24_wh' of BaseService/biService into feature/v1.0.24

王浩 1 năm trước cách đây
mục cha
commit
df5dda8fef
1 tập tin đã thay đổi với 9 bổ sung1 xóa
  1. 9 1
      service/acceptance.go

+ 9 - 1
service/acceptance.go

@@ -310,7 +310,15 @@ func WorkMail(gmailAuth []*mail.GmailAuth, personMap map[string]interface{}, pro
 	}
 	content := fmt.Sprintf(`%s,您好,“%s”于%s新增了1条"%s”(工单编号:%s)%s%s,请及时前往【剑鱼PC工作台-受理-工单管理-我负责的】进行工单处理。`, personName1, personName2, createTimeStr, orderType, acceptance_no, gconv.String(common.If(phone == "", "", fmt.Sprintf(`,客户联系方式为:%s`, phone))), gconv.String(common.If(company == "", "", fmt.Sprintf(`,公司名称:%s`, company))))
 	toMail := gconv.String(personMap["mail"])
-	toCc := fmt.Sprintf("%s%s", gconv.String(common.If(gconv.String(personMap["deptPersonMail"]) == "", "", gconv.String(personMap["deptPersonMail"]))), gconv.String(common.If(gconv.String(personMap["superiorDepthPersonMail"]) == "", "", gconv.String(personMap["superiorDepthPersonMail"]))))
+	mailArr := []string{}
+	if gconv.String(common.If(gconv.String(personMap["deptPersonMail"]) == "", "", gconv.String(personMap["deptPersonMail"]))) != "" {
+		mailArr = append(mailArr, gconv.String(common.If(gconv.String(personMap["deptPersonMail"]) == "", "", gconv.String(personMap["deptPersonMail"]))))
+	}
+	if gconv.String(common.If(gconv.String(personMap["superiorDepthPersonMail"]) == "", "", gconv.String(personMap["superiorDepthPersonMail"]))) != "" {
+		mailArr = append(mailArr, gconv.String(common.If(gconv.String(personMap["superiorDepthPersonMail"]) == "", "", gconv.String(personMap["superiorDepthPersonMail"]))))
+	}
+
+	toCc := strings.Join(mailArr, ",")
 	log.Println(toMail, toCc, title, content)
 	/*toMail = "wanghao@topnet.net.cn"
 	toCc = "wanghao@topnet.net.cn"*/