Merge pull request #311 from gszw90/feature/handle_transaction
fix: 操作工单过程中出现错误并返回,事务未回滚
This commit is contained in:
@@ -779,6 +779,7 @@ func (h *Handle) HandleWorkOrder(
|
|||||||
Where("user_id = ?", tools.GetUserId(c)).
|
Where("user_id = ?", tools.GetUserId(c)).
|
||||||
Find(¤tUserInfo).Error
|
Find(¤tUserInfo).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
h.tx.Rollback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -805,6 +806,7 @@ func (h *Handle) HandleWorkOrder(
|
|||||||
// 获取流程通知类型列表
|
// 获取流程通知类型列表
|
||||||
err = json.Unmarshal(processInfo.Notice, ¬iceList)
|
err = json.Unmarshal(processInfo.Notice, ¬iceList)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
h.tx.Rollback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -816,6 +818,7 @@ func (h *Handle) HandleWorkOrder(
|
|||||||
Pluck("email", &emailCCList).Error
|
Pluck("email", &emailCCList).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.New("查询邮件抄送人失败")
|
err = errors.New("查询邮件抄送人失败")
|
||||||
|
h.tx.Rollback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -862,6 +865,7 @@ func (h *Handle) HandleWorkOrder(
|
|||||||
Where("user_id = ?", h.workOrderDetails.Creator).
|
Where("user_id = ?", h.workOrderDetails.Creator).
|
||||||
Find(&sendToUserList).Error
|
Find(&sendToUserList).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
h.tx.Rollback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user