From bb87184898fe03a0b1fb6d8b23fa2fee68a95b6a Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Sun, 5 May 2024 19:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E8=AF=A6=E6=83=85=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=A3=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/awesome/group/game/service/AdminService.java   | 5 +++++
 .../awesome/group/game/service/bo/MatrixAdvRecordBo.java     | 2 ++
 2 files changed, 7 insertions(+)

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<MatrixAdvRecord> iPage = advRecordMapper.selectPage(new Page<>(page, pageSize), wrapper);
         Map<Integer, MatrixApp> appMap = appList.stream().collect(Collectors.toMap(MatrixApp::getId, x -> x));
+        List<MatrixAdmin> adminList = adminMapper.selectList(null);
+        Map<Integer, String> 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();