From 4b495fbdc2f19716b4d0cd271545a5cca5a64464 Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Sun, 17 Mar 2024 15:19:07 +0800
Subject: [PATCH] fx

---
 .../java/awesome/group/game/service/AdminService.java     | 5 +++++
 .../java/awesome/group/game/service/bo/PageResult.java    | 8 ++++++++
 2 files changed, 13 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 633f6e7..7431fcb 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
@@ -15,12 +15,14 @@ import awesome.group.game.service.common.exception.PaganiExceptionCode;
 import awesome.group.game.service.util.EncryptUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,6 +70,9 @@ public class AdminService {
         wrapper.orderByDesc(MatrixAdvRecord::getId);
         if (ownerId != 1) {
             List<Integer> appIds = appList.stream().filter(x -> x.getOwnerId() != null && x.getOwnerId() == ownerId).map(MatrixApp::getId).toList();
+            if (CollectionUtils.isEmpty(appIds)) {
+                return new PageResult<>(new ArrayList<>(), 0);
+            }
             wrapper.in(MatrixAdvRecord::getAppId, appIds);
         }
         int page = param.current;
diff --git a/game-service/src/main/java/awesome/group/game/service/bo/PageResult.java b/game-service/src/main/java/awesome/group/game/service/bo/PageResult.java
index ed42c89..cfd12eb 100644
--- a/game-service/src/main/java/awesome/group/game/service/bo/PageResult.java
+++ b/game-service/src/main/java/awesome/group/game/service/bo/PageResult.java
@@ -5,4 +5,12 @@ import java.util.List;
 public class PageResult<T> {
     public List<T> data;
     public long total;
+
+    public PageResult() {
+    }
+
+    public PageResult(List<T> data, long total) {
+        this.data = data;
+        this.total = total;
+    }
 }