From 36627e4ca5ea190c4efc152baa2c4efaee5490bb Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sat, 28 Nov 2020 19:24:08 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/workflow/workflowUse/workflowUse.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/view/workflow/workflowUse/workflowUse.vue b/web/src/view/workflow/workflowUse/workflowUse.vue
index 862f9fc43..93baa94ea 100644
--- a/web/src/view/workflow/workflowUse/workflowUse.vue
+++ b/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>

From e102f820c15c9240f642c13ef909930c3061f884 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sun, 29 Nov 2020 22:12:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=88=E6=AD=A2=E4=BE=9D=E7=84=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/service/sys_workflow.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/service/sys_workflow.go b/server/service/sys_workflow.go
index b588d2ee2..d18355de6 100644
--- a/server/service/sys_workflow.go
+++ b/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,

From b09d142091a5b88a8323bc3c5260c9e7bd7bde51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AC=E9=A3=8E?= <1770963469@qq.com>
Date: Thu, 3 Dec 2020 18:16:03 +0800
Subject: [PATCH 3/5] Update image.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复上传图片组件bug
---
 web/src/components/upload/image.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/src/components/upload/image.vue b/web/src/components/upload/image.vue
index c5c9d92e1..6801dc225 100644
--- a/web/src/components/upload/image.vue
+++ b/web/src/components/upload/image.vue
@@ -13,6 +13,7 @@
     <el-upload
       class="image-uploader"
       :action="`${path}/fileUploadAndDownload/upload`"
+      :headers="{ 'x-token': token }"
       :show-file-list="false"
       :on-success="handleImageSuccess"
       :before-upload="beforeImageUpload"
@@ -25,6 +26,7 @@
 </template>
 <script>
 const path = process.env.VUE_APP_BASE_API;
+import { mapGetters } from "vuex";
 import ImageCompress from "@/utils/image.js";
 export default {
   name: "upload-image",
@@ -51,6 +53,9 @@ export default {
       path: path,
     };
   },
+  computed: {
+    ...mapGetters("user", ["userInfo", "token"]),
+  },
   methods: {
     beforeImageUpload(file) {
       let isRightSize = file.size / 1024 < this.fileSize;
@@ -65,7 +70,7 @@ export default {
       // this.imageUrl = URL.createObjectURL(file.raw);
       const {  data } = res;
       if (data.file) {
-        this.$emit("change", data.file.url);
+        this.$emit("change", this.path + data.file.url);
       }
     },
   },
@@ -97,4 +102,4 @@ export default {
   height: 178px;
   display: block;
 }
-</style>
\ No newline at end of file
+</style>

From e19bda949b82d9b5f7862902c5371b12aa05d7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AC=E9=A3=8E?= <1770963469@qq.com>
Date: Thu, 3 Dec 2020 19:05:26 +0800
Subject: [PATCH 4/5] Update image.vue

---
 web/src/components/upload/image.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/upload/image.vue b/web/src/components/upload/image.vue
index 6801dc225..47479df5f 100644
--- a/web/src/components/upload/image.vue
+++ b/web/src/components/upload/image.vue
@@ -19,7 +19,7 @@
       :before-upload="beforeImageUpload"
       :multiple="false"
     >
-      <img v-if="imageUrl" :src="imageUrl" class="image" />
+      <img v-if="imageUrl" :src="path + imageUrl" class="image" />
       <i v-else class="el-icon-plus image-uploader-icon"></i>
     </el-upload>
   </div>
@@ -70,7 +70,7 @@ export default {
       // this.imageUrl = URL.createObjectURL(file.raw);
       const {  data } = res;
       if (data.file) {
-        this.$emit("change", this.path + data.file.url);
+        this.$emit("change", data.file.url);
       }
     },
   },

From a5e5c588bacf8b345a82e43e2856c96cdb3e45d2 Mon Sep 17 00:00:00 2001
From: songzhibin97 <718428482@qq.com>
Date: Sat, 5 Dec 2020 22:49:57 +0800
Subject: [PATCH 5/5] Update cmd_Task.go

---
 server/utils/cmd_Task.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/server/utils/cmd_Task.go b/server/utils/cmd_Task.go
index 06454da0f..708be715d 100644
--- a/server/utils/cmd_Task.go
+++ b/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)