|
|
|
@ -124,7 +124,7 @@ public class UserController {
@@ -124,7 +124,7 @@ public class UserController {
|
|
|
|
|
return R.ok(userService.getUserAuthority(user)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@SysLog("用户修改") |
|
|
|
|
@SysLog("用户修改管理用户角色表") |
|
|
|
|
@PutMapping("/update") |
|
|
|
|
@PreAuthorize("@pms.hasPermission('user_edit')") |
|
|
|
|
public R update(@RequestBody User user) { |
|
|
|
@ -132,6 +132,14 @@ public class UserController {
@@ -132,6 +132,14 @@ public class UserController {
|
|
|
|
|
return R.ok(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@SysLog("用户修改") |
|
|
|
|
@PutMapping("/updateUser") |
|
|
|
|
@PreAuthorize("@pms.hasPermission('user_edit')") |
|
|
|
|
public R updateUser(@RequestBody User user) { |
|
|
|
|
userService.updateById(user); |
|
|
|
|
return R.ok(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@SysLog("用户删除") |
|
|
|
|
@DeleteMapping("/remove/{ids:[\\w,]+}") |
|
|
|
|
@PreAuthorize("@pms.hasPermission('user_del')") |
|
|
|
|