diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java index 1da916c1..95008a11 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java @@ -301,12 +301,14 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService { } } else { updateApproval.setRequiredApprovers(1); - LoginUser currentUser = LoginHelper.getLoginUser(); + // 根据applicantId查询审批人name和id + WmsApproval approval = baseMapper.selectOne(new LambdaQueryWrapper().eq(WmsApproval::getApprovalId, approvalId)); + List currentUser = userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getNickName, approval.getApproverName())); if (currentUser != null) { WmsApprovalTaskBo taskBo = new WmsApprovalTaskBo(); taskBo.setApprovalId(approvalId); - taskBo.setApproverId(LoginHelper.getUserId()); - taskBo.setApproverName(LoginHelper.getNickName()); + taskBo.setApproverId(currentUser.get(0).getUserId()); + taskBo.setApproverName(approval.getApproverName()); taskBo.setTaskStatus("pending"); approvalTaskMapper.insert(BeanUtil.toBean(taskBo, WmsApprovalTask.class)); }