XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug.

Browse Source
This commit is contained in:
Mr. Lan 2020-07-26 01:11:47 +08:00
parent 4620c91730
commit 5cb6f9d094
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pkg/service/handle.go
View File

@ -661,6 +661,21 @@ func (h *Handle) HandleWorkOrder(
return return
} }
bodyData := notify.BodyData{
SendTo: map[string]interface{}{
"userList": sendToUserList,
},
Subject: sendSubject,
Description: sendDescription,
Classify: noticeList,
ProcessId: h.workOrderDetails.Process,
Id: h.workOrderDetails.Id,
Title: h.workOrderDetails.Title,
Creator: currentUserInfo.NickName,
Priority: h.workOrderDetails.Priority,
CreatedAt: h.workOrderDetails.CreatedAt.Format("2006-01-02 15:04:05"),
}
// 判断目标是否是结束节点 // 判断目标是否是结束节点
if h.targetStateValue["clazz"] == "end" && h.endHistory == true { if h.targetStateValue["clazz"] == "end" && h.endHistory == true {
sendSubject = "您的工单已处理完成" sendSubject = "您的工单已处理完成"
@ -679,7 +694,7 @@ func (h *Handle) HandleWorkOrder(
h.tx.Rollback() h.tx.Rollback()
return return
} }
if len(noticeList) > 0 {
// 查询工单创建人信息 // 查询工单创建人信息
err = h.tx.Model(&system.SysUser{}). err = h.tx.Model(&system.SysUser{}).
Where("user_id = ?", h.workOrderDetails.Creator). Where("user_id = ?", h.workOrderDetails.Creator).
@ -688,24 +703,17 @@ func (h *Handle) HandleWorkOrder(
return return
} }
// 发送通知 bodyData.SendTo = map[string]interface{}{
go func() {
bodyData := notify.BodyData{
SendTo: map[string]interface{}{
"userList": sendToUserList, "userList": sendToUserList,
},
Subject: sendSubject,
Description: sendDescription,
Classify: noticeList,
ProcessId: h.workOrderDetails.Process,
Id: h.workOrderDetails.Id,
Title: h.workOrderDetails.Title,
Creator: currentUserInfo.NickName,
Priority: h.workOrderDetails.Priority,
CreatedAt: h.workOrderDetails.CreatedAt.Format("2006-01-02 15:04:05"),
} }
bodyData.Subject = sendSubject
bodyData.Description = sendDescription
// 发送通知
go func(bodyData notify.BodyData) {
bodyData.SendNotify() bodyData.SendNotify()
}() }(bodyData)
}
} }
h.tx.Commit() // 提交事务 h.tx.Commit() // 提交事务
@ -717,24 +725,16 @@ func (h *Handle) HandleWorkOrder(
return return
} }
// 发送通知 bodyData.SendTo = map[string]interface{}{
go func() {
bodyData := notify.BodyData{
SendTo: map[string]interface{}{
"userList": sendToUserList, "userList": sendToUserList,
},
Subject: sendSubject,
Description: sendDescription,
Classify: noticeList,
ProcessId: h.workOrderDetails.Process,
Id: h.workOrderDetails.Id,
Title: h.workOrderDetails.Title,
Creator: currentUserInfo.NickName,
Priority: h.workOrderDetails.Priority,
CreatedAt: h.workOrderDetails.CreatedAt.Format("2006-01-02 15:04:05"),
} }
bodyData.Subject = sendSubject
bodyData.Description = sendDescription
// 发送通知
go func(bodyData notify.BodyData) {
bodyData.SendNotify() bodyData.SendNotify()
}() }(bodyData)
} }
// 执行流程公共任务及节点任务 // 执行流程公共任务及节点任务