From fdfaab6ef7b5eed0fc7a368c94a9506627ef04ee Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Wed, 11 Dec 2024 13:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E8=BD=A6=E5=91=98=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=93=8D=E4=BD=9C=E5=B7=A5=E5=8D=95=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InspectionInfoServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index c848ddac..c5d09503 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -573,12 +573,14 @@ public class InspectionInfoServiceImpl extends ServiceImpl roleIds = roles.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList()); - List workNodes = workNodeService.list(new LambdaQueryWrapper() - .and(i -> - i.eq(InspectionWorkNode::getInspectionInfoId, id) - .in(InspectionWorkNode::getRoleId, roleIds) - .eq(InspectionWorkNode::getStatus, status) - )); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(InspectionWorkNode::getInspectionInfoId, id); + wrapper.eq(InspectionWorkNode::getStatus, status); + InspectionInfo inspectionInfo = baseMapper.selectById(id); + if (!inspectionInfo.getLeadManId().equals(userId)){ + wrapper.in(InspectionWorkNode::getRoleId, roleIds); + } + List workNodes = workNodeService.list(wrapper); if (CollUtil.isEmpty(workNodes)){ throw exception0(500, "查询节点为空"); }