From 2b83b077740ccf339081e007d7818b4fbe252043 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 18 Sep 2025 14:24:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-4100)=20-=20=E6=94=AF=E6=92=91?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=8A=82=E7=82=B9=E6=93=8D=E4=BD=9C=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/bpmn/BpmnProcessTaskController.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java
index f09c635b0..f90b4cf13 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java
@@ -109,7 +109,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
         }
         List<AttachmentDTO> tempAttachments = ListUtils.defaultIfNull(dto.getAttachmentList(), new ArrayList<>());
@@ -135,7 +135,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
         }
         List<AttachmentDTO> tempAttachments = ListUtils.defaultIfNull(dto.getAttachmentList(), new ArrayList<>());
@@ -196,7 +196,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId()) && StringUtils.hasText(dto.getApprover().getPersonId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
         }
         populateUsersAvatar(dto.getApprover());
@@ -229,7 +229,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
         }
         populateUsersAvatar(dto.getApprover());
@@ -263,7 +263,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getOriginAssigner().getPersonId()));
         }
         // 填充头像
@@ -310,7 +310,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getOriginAssigner().getPersonId()));
         }
         // 填充头像
@@ -334,7 +334,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
         if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
             throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
         }
-        if(!StringUtils.hasText(dto.getTaskId())) {
+        if (!StringUtils.hasText(dto.getTaskId())) {
             dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getOriginAssigner().getPersonId()));
         }
         populateUsersAvatar(dto.getOriginAssigner());