|
@ -207,7 +207,7 @@ public class AdminService { |
|
|
List<MatrixAdmin> res = adminMapper.selectList(query); |
|
|
List<MatrixAdmin> res = adminMapper.selectList(query); |
|
|
|
|
|
|
|
|
List<MatrixAdminBo> data = res.stream().map(MatrixAdminBo::new).toList(); |
|
|
List<MatrixAdminBo> data = res.stream().map(MatrixAdminBo::new).toList(); |
|
|
List<Integer> deviceOwners = data.stream().filter(x -> x.getRole() == DEVICE_OWNER).map(MatrixAdminBo::getId).toList(); |
|
|
List<Integer> deviceOwners = data.stream().filter(x -> x.getRole() == DEVICE_OWNER || x.getRole() == PROXY).map(MatrixAdminBo::getId).toList(); |
|
|
Map<Integer, OverviewBo> overviewBoMap = deviceService.incomeOverview(deviceOwners); |
|
|
Map<Integer, OverviewBo> overviewBoMap = deviceService.incomeOverview(deviceOwners); |
|
|
data.forEach(x -> x.overview = overviewBoMap.get(x.getId())); |
|
|
data.forEach(x -> x.overview = overviewBoMap.get(x.getId())); |
|
|
return data; |
|
|
return data; |
|
|