From b10d86c964b11adbecc806924441f67662f36439 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 七月 2024 14:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 6f13e7c..e897e65 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -43,7 +43,6 @@
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
-// @PreAuthorize("hasRole('ROLE_admin')")
@PreAuthorize("hasAuthority('xt:yh')")
public Result<String> logout() {
return Result.success(sysUserService.logout());
@@ -61,10 +60,9 @@
@PostMapping("/updateUser")
// @PreAuthorize("hasAuthority('sys:user:update')")
public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) {
- //return Result.success(sysUserService.updateUser(sysUser));
sysUserService.updateUser(sysUser);
GeneralRequest request=new GeneralRequest();
- request.setKey("");
+ //request.setKey("");
return Result.success(sysUserService.listByUserName(request));
//鏇存敼浜嗕慨鏀逛箣鍚庤繑鍥炴墍鏈夌敤鎴峰垪琛�
}
--
Gitblit v1.8.0