Merge branch 'master' of http://git.minpay.cc/SupplyChain/flowable

flowable-front/src/components/views/deal.vue

@@ -349,6 +349,7 @@
 						if ("SecurityError" != e.name) {
 							return;
 						}
+						this.tableloading = false;
 					}
 				}
 				//this.submitUpload();
@@ -370,14 +371,17 @@
 								offset : 70
 							});
 							this.attachmentVisible = false;
+							this.tableloading = false;
 							this.closeDeal();
 						} else {
 							this.$message.error({message : response.data.message, offset : 70});
+							this.tableloading = false;
 						}
 					}
 				}).catch(err => {
 					console.log(err)
 					this.$message.error({message : '请求失败!', offset : 70});
+					this.tableloading = false;
 				})
 			},
 			

flowable/src/main/java/com/huyi/flowable/controller/FlowController.java

@@ -258,7 +258,7 @@ public class FlowController {
         if (StringUtils.isEmpty(String.valueOf(loginUser.getSysUser().getStaffCode()))){
             throw new Exception("暂无绑定员工");
         }
-        return flowProcess.getMyStartProcint(String.valueOf(loginUser.getSysUser().getStaffCode()), param, pageNum, pageSize);
+        return flowProcess.getMyStartProcint(String.valueOf(loginUser.getSysUser().getUserId()), param, pageNum, pageSize);
     }
 
     /**
@@ -342,7 +342,7 @@ public class FlowController {
         Map<String, Object> param = new HashMap<>();
         param.put("excutionName", excutionName);
         param.put("processDefName", processDefName);
-        Page<Map<String, Object>> page = flowTask.getMyTask(String.valueOf(loginUser.getSysUser().getStaffCode()), param, pageNum, pageSize);
+        Page<Map<String, Object>> page = flowTask.getMyTask(String.valueOf(loginUser.getSysUser().getUserId()), param, pageNum, pageSize);
         return new BaseResult(page);
     }
 
@@ -363,7 +363,7 @@ public class FlowController {
         param.put("excutionName", excutionName);
         param.put("processDefName", processDefName);
         LoginUser user = tokenService.getUser(request);
-        return flowTask.getMyJoinProcint(user.getSysUser().getStaffCode(), param, pageNum, pageSize);
+        return flowTask.getMyJoinProcint(String.valueOf(user.getSysUser().getUserId()), param, pageNum, pageSize);
     }
 
     /**
@@ -411,7 +411,7 @@ public class FlowController {
         BaseResult res;
         try {
             Authentication.setAuthenticatedUserId(request.getHeader("Authorization"));
-            res = flowTask.completeTask(taskId, type, message, files, attachmentDescription, user.getSysUser().getStaffCode());
+            res = flowTask.completeTask(taskId, type, message, files, attachmentDescription, String.valueOf(user.getSysUser().getUserId()));
         } catch (Exception e) {
             throw e;
         } finally {