Merge branches 'develop', 'gva_gormv2_dev' and 'master' of...

Merge branches 'develop', 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop

server/service/sys_workflow.go

@@ -382,7 +382,18 @@ func createNewWorkflowMove(tx *gorm.DB, oldWfm *model.WorkflowMove, targetNodeID
 		}
 
 		return nil, newWfm
-
+	case constant.END:
+		newWfm = append(newWfm, model.WorkflowMove{
+			BusinessID:        oldWfm.BusinessID,
+			BusinessType:      oldWfm.BusinessType,
+			PromoterID:        oldWfm.PromoterID,
+			OperatorID:        oldWfm.OperatorID,
+			WorkflowNodeID:    targetNodeID,
+			WorkflowProcessID: oldWfm.WorkflowProcessID,
+			Param:             "",
+			Action:            "",
+			IsActive:          false})
+		return nil, newWfm
 	default:
 		newWfm = append(newWfm, model.WorkflowMove{
 			BusinessID:        oldWfm.BusinessID,

server/utils/cmd_Task.go

@@ -73,17 +73,12 @@ func newT(f func(chan struct{}) error) *T {
 //@description: 添加任务
 
 func (t *T) AddTask() {
-	if len(t.ch) == 1 {
-		return
-	}
-	t.Lock()
-	defer t.Unlock()
-	if len(t.ch) == 1 {
+	select {
+	case t.ch <- struct{}{}:
+	default:
 		// 代表已经有任务了
 		// 直接丢弃这次任务
-		return
 	}
-	t.ch <- struct{}{}
 }
 
 //@author: [songzhibin97](https://github.com/songzhibin97)

web/src/view/workflow/workflowUse/workflowUse.vue

@@ -6,7 +6,7 @@
         <div slot="title">{{ item.workflowNode.label }}</div>
         <div slot="description">
           <div>节点说明:{{ item.workflowNode.description }}</div>
-          <div>操作人:{{ item.promoter.nickName }}</div>
+          <div v-if="item.operator.nickName">操作人:{{ item.operator.nickName }}</div>
           <div>操作参数:{{ item.param||'无参数' }}</div>
         </div>
       </el-step>