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