邮箱修改

service/acceptance.go

@@ -243,8 +243,6 @@ func AddOrderWork(orderType, acceptance_no, nowTime, phone,
 			"creator_time":        nowTime,        // 创建时间
 		}
 
-		log.Println(approvalRecordMap)
-
 		// 插入审批记录
 		ok4 := WorkOrder.InsertByTx(tx, "approval_record", approvalRecordMap)
 		if ok4 <= 0 {
@@ -252,7 +250,6 @@ func AddOrderWork(orderType, acceptance_no, nowTime, phone,
 			return false, 0, "", ""
 		}
 
-		log.Println(personMap)
 		log.Println(GmailAuth, personMap, strings.Join(selectPersonMap.Product, ","), dkPerson, in.EntUserName, nowTime, work_order_no, phone, company)
 
 		// 发送工作邮件
@@ -372,10 +369,10 @@ func FindCandidate(personArr []Person, entId int64, orderType string) PersonJson
 	personEntity = persons[k]
 
 	// 查询部门管理员信息
-	fetchDeptAdmin(personEntity)
+	fetchDeptAdmin(&personEntity)
 
 	// 查询上级部门管理员信息
-	fetchSuperiorAdmin(personEntity)
+	fetchSuperiorAdmin(&personEntity)
 
 	return personEntity
 }
@@ -431,7 +428,7 @@ func findPersonIndexByName(personArr []PersonJson, name string) int {
 // 参数：
 //
 //	person - 人员信息(会被修改)
-func fetchDeptAdmin(person PersonJson) {
+func fetchDeptAdmin(person *PersonJson) {
 	deptMap := JyMysql.SelectBySql(`SELECT c.name AS name, c.mail AS mail
 		FROM entniche_department_user a
 		INNER JOIN entniche_user_role b ON a.dept_id = ? AND a.user_id = b.user_id AND b.role_id != ""
@@ -447,7 +444,7 @@ func fetchDeptAdmin(person PersonJson) {
 // 参数：
 //
 //	person - 人员信息(会被修改)
-func fetchSuperiorAdmin(person PersonJson) {
+func fetchSuperiorAdmin(person *PersonJson) {
 	superiorMap := JyMysql.SelectBySql(`SELECT c.*
 		FROM entniche_department d
 		INNER JOIN entniche_department_user a ON d.id = ? AND d.pid = a.dept_id
@@ -533,7 +530,9 @@ func WorkMail(gmailAuth []*mail.GmailAuth, personMap PersonJson, productStr stri
 	}
 
 	log.Println(toMail, title, content)
-
+	if toMail == "" {
+		return
+	}
 	// 尝试使用多个Gmail账号发送
 	for k, v := range gmailAuth {
 		fool := mail.GSendMail_q("剑鱼标讯", toMail, "", "", title, content, "", "", v)