fix: 工单没有自动结束的bug。

keepauto · Nov 25, 2020 · 3a329e6 · 3a329e6
1 parent 5aceaca
commit 3a329e6
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/pkg/service/handle.go b/pkg/service/handle.go
@@ -176,17 +176,6 @@ func (h *Handle) Countersign(c *gin.Context) (err error) {
  if err != nil {
  return
  }
-
- // 如果是跳转到结束节点，则需要修改节点状态
- if h.targetStateValue["clazz"] == "end" {
- err = h.tx.Model(&process.WorkOrderInfo{}).
- Where("id = ?", h.workOrderId).
- Update("is_end", 1).Error
- if err != nil {
- h.tx.Rollback()
- return
- }
- }
  }
  return
 }
@@ -221,6 +210,18 @@ func (h *Handle) circulation() (err error) {
  h.tx.Rollback()
  return
  }
+
+ // 如果是跳转到结束节点，则需要修改节点状态
+ if h.targetStateValue["clazz"] == "end" {
+ err = h.tx.Model(&process.WorkOrderInfo{}).
+ Where("id = ?", h.workOrderId).
+ Update("is_end", 1).Error
+ if err != nil {
+ h.tx.Rollback()
+ return
+ }
+ }
+
  return
 }