diff --git a/game-service/src/main/java/awesome/group/game/service/AdminService.java b/game-service/src/main/java/awesome/group/game/service/AdminService.java index 586138e..95e5090 100644 --- a/game-service/src/main/java/awesome/group/game/service/AdminService.java +++ b/game-service/src/main/java/awesome/group/game/service/AdminService.java @@ -130,10 +130,15 @@ public class AdminService { wrapper.orderByDesc("id"); IPage iPage = advRecordMapper.selectPage(new Page<>(page, pageSize), wrapper); Map appMap = appList.stream().collect(Collectors.toMap(MatrixApp::getId, x -> x)); + List adminList = adminMapper.selectList(null); + Map adminMap = adminList.stream().collect(Collectors.toMap(MatrixAdmin::getId, MatrixAdmin::getName)); res.total = iPage.getTotal(); res.data = iPage.getRecords().stream().map(x -> { MatrixAdvRecordBo bo = new MatrixAdvRecordBo(x, appMap.get(x.getAppId())); BeanUtils.copyProperties(x, bo); + if (x.getAdminId() != null) { + bo.adminName = adminMap.get(x.getAdminId()); + } return bo; }).toList(); return res; diff --git a/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java b/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java index 02c2f04..c0c445a 100644 --- a/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java +++ b/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java @@ -9,6 +9,8 @@ public class MatrixAdvRecordBo extends MatrixAdvRecordEditBo { public long createdAt; public Integer id; + public String adminName; + public MatrixAdvRecordBo(MatrixAdvRecord r, MatrixApp app) { this.advType = r.getAdvType(); this.deviceId = r.getDeviceId();