From faac750ff6648334d7b264b934f783f3ad2e6ca9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 16 Dec 2025 17:14:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(hrm):=20=E4=BF=AE=E5=A4=8D=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BB=BB=E5=8A=A1=E7=94=A8=E6=88=B7ID=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E9=80=BB=E8=BE=91=E5=B9=B6=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Objects.requireNonNullElse 替换为三元运算符以避免空指针异常 - 在 HrmFlowTaskServiceImpl 中引入 java.util.Date 类以支持新的时间字段类型 - 修改 seal 模块中的 isEnabled 方法调用方式以确保配置正确读取 - 统一流程实例与任务创建时 assigneeUserId 的默认值处理逻辑 - 调整操作日志创建时间为 Date 类型以兼容数据库存储需求 --- klp-hrm/src/main/java/com/klp/hrm/controller/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/domain/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/domain/bo/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/domain/vo/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/mapper/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/service/1.txt | 0 klp-hrm/src/main/java/com/klp/hrm/service/impl/1.txt | 0 .../klp/hrm/service/impl/HrmFlowInstanceServiceImpl.java | 4 +++- .../com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java | 7 ++++--- .../com/klp/hrm/service/impl/HrmSealReqServiceImpl.java | 2 +- klp-hrm/src/main/resources/mapper/1.txt | 0 11 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/controller/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/domain/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/domain/bo/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/domain/vo/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/mapper/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/service/1.txt delete mode 100644 klp-hrm/src/main/java/com/klp/hrm/service/impl/1.txt delete mode 100644 klp-hrm/src/main/resources/mapper/1.txt diff --git a/klp-hrm/src/main/java/com/klp/hrm/controller/1.txt b/klp-hrm/src/main/java/com/klp/hrm/controller/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/1.txt b/klp-hrm/src/main/java/com/klp/hrm/domain/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/bo/1.txt b/klp-hrm/src/main/java/com/klp/hrm/domain/bo/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/vo/1.txt b/klp-hrm/src/main/java/com/klp/hrm/domain/vo/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/mapper/1.txt b/klp-hrm/src/main/java/com/klp/hrm/mapper/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/1.txt b/klp-hrm/src/main/java/com/klp/hrm/service/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/1.txt b/klp-hrm/src/main/java/com/klp/hrm/service/impl/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowInstanceServiceImpl.java b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowInstanceServiceImpl.java index 7ba23bcb..91d62653 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowInstanceServiceImpl.java +++ b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowInstanceServiceImpl.java @@ -74,7 +74,9 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService { HrmFlowTask task = new HrmFlowTask(); task.setInstId(inst.getInstId()); task.setNodeId(firstNode.getNodeId()); - task.setAssigneeUserId(Objects.requireNonNullElse(bo.getStartUserId(), 0L)); + //task.setAssigneeUserId(Objects.requireNonNullElse(bo.getStartUserId(), 0L)); + // 修复：使用三元运算符替代 Objects.requireNonNullElse + task.setAssigneeUserId(bo.getStartUserId() != null ? bo.getStartUserId() : 0L); task.setStatus("pending"); taskMapper.insert(task); 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 db2889a3..1b2c5f73 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 @@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -109,7 +110,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { HrmFlowTask nextTask = new HrmFlowTask(); nextTask.setInstId(inst.getInstId()); nextTask.setNodeId(next.getNodeId()); - nextTask.setAssigneeUserId(Objects.requireNonNullElse(actionUserId, 0L)); + nextTask.setAssigneeUserId(actionUserId != null ? actionUserId : 0L); nextTask.setStatus("pending"); baseMapper.insert(nextTask); } else { @@ -170,7 +171,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { HrmFlowTask reTask = new HrmFlowTask(); reTask.setInstId(inst.getInstId()); reTask.setNodeId(task.getNodeId()); - reTask.setAssigneeUserId(Objects.requireNonNullElse(actionUserId, task.getAssigneeUserId())); + reTask.setAssigneeUserId(actionUserId != null ? actionUserId : task.getAssigneeUserId()); reTask.setStatus("pending"); baseMapper.insert(reTask); if ("seal".equalsIgnoreCase(inst.getBizType())) { @@ -186,7 +187,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { log.setAction(action); log.setRemark(remark); log.setActionUserId(userId); - log.setCreateTime(LocalDateTime.now()); + log.setCreateTime(new Date()); actionMapper.insert(log); } diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmSealReqServiceImpl.java b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmSealReqServiceImpl.java index f7834942..c212463c 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmSealReqServiceImpl.java +++ b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmSealReqServiceImpl.java @@ -118,7 +118,7 @@ public class HrmSealReqServiceImpl implements IHrmSealReqService { @Override @Transactional(rollbackFor = Exception.class) public String stampWithJava(Long bizId, HrmSealStampBo cmd) { - if (!Boolean.TRUE.equals(stampProperties.getJavaService().getEnabled())) { + if (!Boolean.TRUE.equals(stampProperties.getJavaService().isEnabled())) { throw new ServiceException("Java盖章未启用"); } String resultUrl = doPdfStamp(cmd); diff --git a/klp-hrm/src/main/resources/mapper/1.txt b/klp-hrm/src/main/resources/mapper/1.txt deleted file mode 100644 index e69de29b..00000000