From 8b1540e5c41db38cc3fac78e31dff14e599477a4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 5 Jan 2026 13:50:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor(flow):=20=E7=A7=BB=E9=99=A4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BB=BB=E5=8A=A1=E5=AE=9E=E4=BE=8BID=E5=92=8C?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9ID=E7=9A=84=E9=9D=9E=E7=A9=BA=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 instId 和 nodeId 字段的 @NotNull 注解验证
- 在流程任务撤回处理中添加了 bizType 和 bizId 的设置
- 调整了流程任务创建时的业务类型和业务ID赋值逻辑
---
 klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowTaskBo.java  | 2 --
 .../java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowTaskBo.java b/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowTaskBo.java
index 5d247b7a..0f9d6c71 100644
--- a/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowTaskBo.java
+++ b/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowTaskBo.java
@@ -12,9 +12,7 @@ import java.util.Date;
 public class HrmFlowTaskBo extends BaseEntity {
 
     private Long taskId;
-    @NotNull(message = "实例ID不能为空")
     private Long instId;
-    @NotNull(message = "节点ID不能为空")
     private Long nodeId;
     private Long assigneeUserId;
     private String status;
diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java
index 37eefdf8..8d5ff14b 100644
--- a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java
+++ b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java
@@ -291,6 +291,8 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService {
             HrmFlowTask reTask = new HrmFlowTask();
             reTask.setInstId(inst.getInstId());
             reTask.setNodeId(0L);
+            reTask.setBizType(inst.getBizType());
+            reTask.setBizId(inst.getBizId());
             // 撤回后回到“原审批人”（撤回前的办理人）
             reTask.setAssigneeUserId(task.getAssigneeUserId());
             reTask.setStatus("pending");