From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 5866ae1..694c53c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -146,7 +146,7 @@
{
return R.fail("保存用户'" + username + "'失败，注册账号已存在");
}
- return R.ok(userService.registerUser(sysUser));
+ return R.ok(userService.registerUser(sysUser)!=null);
}
/**
@@ -352,10 +352,11 @@
* @date 2023/4/30 15:36
* @version 1.0
*/
- @InnerAuth
@PostMapping("/getSysUser")
public R<SysUser> getSysUser(@RequestBody Long userId){
+ logger.info("userId"+userId);
SysUser sysUser = userService.selectUserById(userId);
+ logger.info("sysUser"+sysUser.toString());
return R.ok(sysUser);
}
@@ -366,9 +367,9 @@
* @version 1.0
*/
@PostMapping("/registerUser")
- public R registerUser(@RequestBody SysUser sysUser){
+ public R<SysUser> registerUser(@RequestBody SysUser sysUser){
userService.registerUser(sysUser);
- return R.ok();
+ return R.ok(sysUser);
}
@@ -379,7 +380,6 @@
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
@PostMapping("/updateUserMobile")
public R updateUserMobile(@RequestBody SysUser sysUser){
userService.updateUserMobile(sysUser);
@@ -391,7 +391,6 @@
* @param appEditUserDto
* @return
*/
- @InnerAuth
@PostMapping("/editUserInfo")
public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
userService.editUserInfo(appEditUserDto);
--
Gitblit v1.7.1