From 667c18c338b807fb2ea6340db4e87ca0cb043be2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 May 2023 17:49:04 +0800
Subject: [PATCH] 责任人完成工作流任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 8c6dff3..71846e8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -188,8 +188,8 @@
*/
@PostMapping("patrol-complete-task")
@ApiOperation(value = "完成任务", notes = "传入流程信息")
- public R completeTask(PatrolTask patrolTask, String currentUserId) {
- return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId));
+ public R completeTask(PatrolTask patrolTask, String currentUserId,String taskUser) {
+ return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId,taskUser));
}
/**
@@ -218,8 +218,10 @@
List<BladeFlow> data = res.getData();
data.forEach(bladeFlow -> {
PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- byId.setFlow(bladeFlow);
- patrolTaskList.add(byId);
+ if (byId != null){
+ byId.setFlow(bladeFlow);
+ patrolTaskList.add(byId);
+ }
});
}
//设置数据集
--
Gitblit v1.9.3