From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 1ceb07a..a76ef76 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -51,7 +51,22 @@
@Autowired
private TCourseInfoRecordService courseInfoRecordService;
-
+ /**
+ * 获取所有用户
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/queryAppUserList")
+ public List<TAppUser> queryAppUserList(@RequestBody AppUserByNameAndPhoneDTO dto){
+ return appUserService.queryAPPUserByNameAndPhone(dto);
+ }
+ /**
+ * 根据用户姓名和电话模糊查询
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/queryAPPUserByNameAndPhone")
+ public List<TAppUser> queryAPPUserByNameAndPhone(@RequestBody AppUserByNameAndPhoneDTO dto){
+ return appUserService.queryAPPUserByNameAndPhone(dto);
+ }
/**
* 根据用户id获取用户信息
* @param appUserId
@@ -81,7 +96,13 @@
if (null != phone){
return 5001;
}
+ }else {
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()));
+ if (null != phone){
+ return 5001;
+ }
}
+
query.setIsVip(0);
query.setPassword("111111");
query.setInsertTime(new Date());
@@ -91,6 +112,7 @@
/**
* 获取用户信息列表数据
*/
+ @ResponseBody
@RequestMapping("/base/appUser/listAll")
public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){
@@ -267,6 +289,7 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
+
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -410,7 +433,6 @@
return new ArrayList<>();
}
}
-
@PostMapping("/base/appUser/queryByNamePhone")
public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
--
Gitblit v1.7.1