From babbc91486d2101c7f1b24a861536886c1200096 Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Wed, 12 Jun 2024 11:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8E=AF=E5=A2=83=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=20&=20=E6=94=AF=E6=8C=81userId=E6=9F=A5=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/awesome/group/game/service/bo/AdvRecordQuery.java   | 1 +
 .../java/awesome/group/game/service/bo/citrus/UserBo.java    | 5 ++++-
 .../java/awesome/group/game/service/matrix/AdminService.java | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
index 315fd01..50f5811 100644
--- a/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
+++ b/game-service/src/main/java/awesome/group/game/service/bo/AdvRecordQuery.java
@@ -9,4 +9,5 @@ public class AdvRecordQuery extends PageParam {
     public String code;
     public List<String> createdAt;
     public Integer adminId;
+    public Integer userId;
 }
diff --git a/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java b/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java
index c469ee0..2da535d 100644
--- a/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java
+++ b/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java
@@ -17,6 +17,8 @@ public class UserBo {
     public String inviteCode;
     public String inviteUrl;
 
+    public Integer env;
+
     public String wxOpenId;//微信openId
     public long createdAt;
 
@@ -37,9 +39,10 @@ public class UserBo {
         this.realMoney = u.getRealMoney();
         this.goldCoin = u.getIncome() - (u.getMoney() * 1000);
         this.wxOpenId = u.getWxOpenId();
+        this.env = u.getEnv();
         this.createdAt = u.getCreatedAt().getTime();
 
-        if(!StringUtils.hasText(nickname)) {
+        if (!StringUtils.hasText(nickname)) {
             this.nickname = replaceWithX(this.mobile);
         }
 
diff --git a/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java b/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java
index 1b083bb..7517522 100644
--- a/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java
+++ b/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java
@@ -119,6 +119,9 @@ public class AdminService {
         if (StringUtils.hasText(param.deviceId)) {
             wrapper.eq("device_id", param.deviceId);
         }
+        if(param.userId != null) {
+            wrapper.eq("user_id", param.userId);
+        }
         if (!CollectionUtils.isEmpty(param.createdAt)) {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             try {