diff --git a/apis/process/workOrder.go b/apis/process/workOrder.go
index dc64fb3..366d48d 100644
--- a/apis/process/workOrder.go
+++ b/apis/process/workOrder.go
@@ -213,13 +213,15 @@ func CreateWorkOrder(c *gin.Context) {
SendTo: map[string]interface{}{
"userList": sendToUserList,
},
- Subject: "您有一条待办工单，请及时处理。",
- Classify: noticeList,
- Id: workOrderValue.Id,
- Title: workOrderValue.Title,
- Creator: userInfo.NickName,
- Priority: workOrderValue.Priority,
- CreatedAt: time.Now().Format("2006-01-02 15:04:05"),
+ Subject: "您有一条待办工单，请及时处理",
+ Description: "您有一条待办工单请及时处理，工单描述如下",
+ Classify: noticeList,
+ ProcessId: workOrderValue.Process,
+ Id: workOrderInfo.Id,
+ Title: workOrderValue.Title,
+ Creator: userInfo.NickName,
+ Priority: workOrderValue.Priority,
+ CreatedAt: time.Now().Format("2006-01-02 15:04:05"),
}
bodyData.SendNotify()
}()
diff --git a/pkg/notify/send.go b/pkg/notify/send.go
index 774b5a8..f19e3a2 100644
--- a/pkg/notify/send.go
+++ b/pkg/notify/send.go
@@ -4,7 +4,6 @@ import (
"bytes"
"ferry/models/system"
"ferry/pkg/notify/email"
- "os"
"text/template"
log "github.com/sirupsen/logrus"
@@ -26,6 +25,8 @@ type BodyData struct {
PriorityValue string // 工单优先级
CreatedAt string // 工单创建时间
Content string // 通知的内容
+ Description string // 表格上面的描述信息
+ ProcessId int // 流程ID
}
func (b *BodyData) ParsingTemplate() (err error) {
@@ -34,7 +35,6 @@ func (b *BodyData) ParsingTemplate() (err error) {
buf bytes.Buffer
)
- log.Info(os.Getwd())
tmpl, err := template.ParseFiles("./pkg/notify/template/email.html")
if err != nil {
return
@@ -68,15 +68,18 @@ func (b *BodyData) SendNotify() {
for _, c := range b.Classify {
switch c {
case 1: // 邮件
- for _, user := range b.SendTo.(map[string]interface{})["userList"].([]system.SysUser) {
- emailList = append(emailList, user.Email)
+ users := b.SendTo.(map[string]interface{})["userList"].([]system.SysUser)
+ if len(users) > 0 {
+ for _, user := range users {
+ emailList = append(emailList, user.Email)
+ }
+ err = b.ParsingTemplate()
+ if err != nil {
+ log.Errorf("模版内容解析失败，%v", err.Error())
+ return
+ }
+ go email.SendMail(emailList, b.Subject, b.Content)
}
- err = b.ParsingTemplate()
- if err != nil {
- log.Errorf("模版内容解析失败，%v", err.Error())
- return
- }
- go email.SendMail(emailList, b.Subject, b.Content)
}
}
}
diff --git a/pkg/notify/template/email.html b/pkg/notify/template/email.html
index 20dbf61..df810ad 100644
--- a/pkg/notify/template/email.html
+++ b/pkg/notify/template/email.html
@@ -6,7 +6,7 @@
- 您有一条待办工单请及时处理，以下为工单详情：
+ {{ .Description }}：
- 点击此处跳转工单详情
+ 点击此处跳转到工单详情