From e3a2245265516fef78b4737d6fffc939e7c5e0af Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 03 七月 2025 17:56:07 +0800
Subject: [PATCH] bug修改
---
pt-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 6f99c0a..2a120b4 100644
--- a/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/pt-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -68,11 +68,11 @@
@ApiOperation(value = "账号管理-获取账号分页列表", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
- public R<IPage<SysUserPageListVO>> getSysUserPageList(@RequestParam("pageNum")Integer pageNum,
- @RequestParam("pageSize")Integer pageSize,
- @RequestParam("nickName")String nickName,
- @RequestParam("phone")Integer phone,
- @RequestParam("status")String status) {
+ public R<IPage<SysUserPageListVO>> getSysUserPageList(@RequestParam(value = "pageNum",required = false,defaultValue = "0")Integer pageNum,
+ @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize,
+ @RequestParam(value = "nickName",required = false)String nickName,
+ @RequestParam(value = "phonenumber",required = false)Integer phone,
+ @RequestParam(value = "status",required = false)String status) {
IPage<SysUserPageListVO> page=new Page<>(pageNum,pageSize);
return R.ok(userService.getSysUserPageList(page,nickName,phone,status));
}
@@ -117,7 +117,7 @@
/**
* 新增用户
*/
- @ApiOperation(value = "账号管理-查看详情（回显）", tags = "系统后台-权限管理")
+ @ApiOperation(value = "账号管理-新增", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -131,7 +131,7 @@
*/
@ApiOperation(value = "账号管理-修改用户", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+ @Log(title = "账号管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public R<Void> edit(@Valid @RequestBody EditSysUserDTO dto) {
userService.edit(dto);
@@ -162,7 +162,7 @@
*/
@ApiOperation(value = "账号管理-删除用户", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
- @Log(title = "用户管理", businessType = BusinessType.DELETE)
+ @Log(title = "账号管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userId}")
public R remove(@PathVariable("userId") Long userId) {
if (Objects.equals(userId, getUserId())) {
@@ -176,7 +176,7 @@
*/
@ApiOperation(value = "账号管理-重置密码", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+ @Log(title = "账号管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPassword/{userId}")
public R<Void> resetPassword(@PathVariable("userId") Long userId) {
userService.resetPassword(userId);
@@ -188,11 +188,11 @@
*/
@ApiOperation(value = "账号管理-状态修改", tags = "系统后台-权限管理")
@PreAuthorize("@ss.hasPermi('system:user:list')")
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+ @Log(title = "账号管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus/{userId}")
public R<Void> changeStatus(@PathVariable("userId") Long userId) {
if (Objects.equals(userId, getUserId())) {
- return R.fail("当前用户不能删除");
+ return R.fail("当前用户不能操作");
}
userService.changeStatus(userId);
return R.ok();
--
Gitblit v1.7.1