From 060b84c46d7097696504aea89f77185320815b07 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 21:44:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' 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