dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引车员可以选择操作工单所有项目

Browse Source
This commit is contained in:
xiaofajia 2024-12-11 13:40:36 +08:00
parent 5524a08201
commit fdfaab6ef7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -573,12 +573,14 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
throw exception0(500, "查询角色为空");
}
List<Long> roleIds = roles.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList());
List<InspectionWorkNode> workNodes = workNodeService.list(new LambdaQueryWrapper<InspectionWorkNode>()
.and(i ->
i.eq(InspectionWorkNode::getInspectionInfoId, id)
.in(InspectionWorkNode::getRoleId, roleIds)
.eq(InspectionWorkNode::getStatus, status)
));
LambdaQueryWrapper<InspectionWorkNode> 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<InspectionWorkNode> workNodes = workNodeService.list(wrapper);
if (CollUtil.isEmpty(workNodes)){
throw exception0(500, "查询节点为空");
}