From 4a3878bda2af50bf1950d977df12ce332e2b1b8b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 2 Mar 2026 11:29:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(approval):=20=E4=BF=AE=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=97=B6=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根据applicantId查询审批人name和id，替换原来的当前登录用户信息 - 通过WmsApproval表查询审批配置信息 - 使用SysUser表根据审批人姓名查询对应的用户ID - 更新审批任务中的审批人ID和姓名字段为正确的值 - 移除LoginHelper依赖，改用数据库查询获取审批人信息 --- .../java/com/klp/service/impl/WmsApprovalServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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)); }