diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java index c9a6445..cef827d 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmReimburseReqBo.java @@ -37,5 +37,7 @@ public class HrmReimburseReqBo extends BaseEntity { private String accessoryReceiptIds; private String remark; + + private Long tplId; } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java index 48718bc..5d8b60f 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmReimburseReqServiceImpl.java @@ -62,14 +62,30 @@ public class HrmReimburseReqServiceImpl implements IHrmReimburseReqService { HrmReimburseReqVo bean = BeanUtil.toBean(add, HrmReimburseReqVo.class); if (ok && "pending".equalsIgnoreCase(add.getStatus())) { - // 选择启用的最高版本模板(允许无模板:走自选审批人一次性审批) - HrmFlowTemplate tpl = flowTemplateMapper.selectOne(Wrappers.lambdaQuery() + Long startUserId = LoginHelper.getUserId(); + + HrmFlowTemplate tpl = null; + // 1) 优先:前端明确选择了模板(tplId 不为空) + if (bo.getTplId() != null) { + tpl = flowTemplateMapper.selectOne(Wrappers.lambdaQuery() + .eq(HrmFlowTemplate::getTplId, bo.getTplId()) + .eq(HrmFlowTemplate::getBizType, "reimburse") + .eq(HrmFlowTemplate::getEnabled, 1) + .last("limit 1")); + } + + // 2) 手动审批:前端选择了手动审批人时,不允许兜底去找模板,否则会意外走到模板里的规则(例如 dept_leader) + boolean manualMode = bo.getTplId() == null && bo.getManualAssigneeUserId() != null; + + // 3) 兜底:只有在既没有 tplId、也没有手动审批人的情况下,才自动选择最新启用模板 + if (!manualMode && tpl == null) { + tpl = flowTemplateMapper.selectOne(Wrappers.lambdaQuery() .eq(HrmFlowTemplate::getBizType, "reimburse") .eq(HrmFlowTemplate::getEnabled, 1) .orderByDesc(HrmFlowTemplate::getVersion) .last("limit 1")); + } - Long startUserId = LoginHelper.getUserId(); HrmFlowStartBo start = new HrmFlowStartBo(); if (tpl != null) { start.setTplId(tpl.getTplId()); @@ -97,6 +113,7 @@ public class HrmReimburseReqServiceImpl implements IHrmReimburseReqService { return baseMapper.deleteBatchIds(ids) > 0; } + private LambdaQueryWrapper buildQueryWrapper(HrmReimburseReqBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getBizId() != null, HrmReimburseReq::getBizId, bo.getBizId());