|
|
@@ -1074,12 +1074,10 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
|
|
|
if (jsonObjectResult != null) {
|
|
|
if (jsonObjectResult.getBoolean("success")) {
|
|
|
list = JSON.parseArray(jsonObjectResult.getString("result"), HwSubcontractor.class);
|
|
|
- if (!list.isEmpty()) {
|
|
|
- //只保留该订单所属需求的服务商
|
|
|
- HwOrder hwOrderDto = baseMapper.getByOrderCode(hwOrder.getOrderCode());
|
|
|
- HwRequirement hwRequirement = hwRequirementMapper.selectById(hwOrderDto.getRequirementId());
|
|
|
- list = list.stream().filter(item -> hwRequirement.getSubcontractorId().equals(item.getId())).collect(Collectors.toList());
|
|
|
- }
|
|
|
+ //只保留该订单所属需求的服务商
|
|
|
+ HwOrder hwOrderDto = baseMapper.getByOrderCode(hwOrder.getOrderCode());
|
|
|
+ HwRequirement hwRequirement = hwRequirementMapper.selectById(hwOrderDto.getRequirementId());
|
|
|
+ list = list.stream().filter(item -> hwRequirement.getSubcontractorId().equals(item.getId())).collect(Collectors.toList());
|
|
|
}
|
|
|
}
|
|
|
}
|