|
|
@@ -80,7 +80,7 @@ public class InspectionServiceImpl implements IInspectionService { |
|
|
|
String tenantId = user.getTenantId(); |
|
|
|
|
|
|
|
query.setTenantId(tenantId); |
|
|
|
query.setType(1); |
|
|
|
// query.setType(1); |
|
|
|
|
|
|
|
//初始部门id |
|
|
|
String deptIdInt = query.getDeptId(); |
|
|
@@ -242,7 +242,7 @@ public class InspectionServiceImpl implements IInspectionService { |
|
|
|
|
|
|
|
private Map<Integer, AirportLineVo> getAirportLineMap(List<InspectionInfoVo> inspectionInfoVoList) { |
|
|
|
List<Integer> airportLineIdList = inspectionInfoVoList.stream().map(o -> o.getInspectionLine()).collect(Collectors.toList()); |
|
|
|
airportLineIdList = airportLineIdList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(x->x))), ArrayList::new)); |
|
|
|
// airportLineIdList = airportLineIdList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(x->x))), ArrayList::new)); |
|
|
|
List<AirportLineVo> airportLineVoList = getAirLineListService.getList(null, airportLineIdList); |
|
|
|
if (CollectionUtil.isEmpty(airportLineVoList)) { |
|
|
|
return null; |