From fe7c2fff004e4a64dae5f0982ab28663c600c778 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 15:20:17 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index b5c911a..028ba01 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -150,10 +150,11 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
-            //判断当前用户是否是员工
+
             AppUser appUser1 = appUserClient.queryAppUser(uid);
-            User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
-            if (null != one) {
+            //判断当前用户是否是员工
+            List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+            if (!one.isEmpty()) {
                 return ResultUtil.success(1);
             }
             //普通用户校验当前时间是否在预约时间段内
@@ -209,8 +210,8 @@
             }
             //判断当前用户是否是员工
             AppUser appUser1 = appUserClient.queryAppUser(uid);
-            User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
-            if (null != one) {
+            List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+            if (!one.isEmpty()) {
                 Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
                 return ResultUtil.success();
             }

--
Gitblit v1.7.1