From fce9759e93db09781e73a14126141685bc4313db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Tue, 25 Mar 2025 18:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20--AdminController.java?= =?UTF-8?q?=20=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B0=E5=AF=86=E7=A0=81=20--AdminPageUser?= =?UTF-8?q?DTO.java=20=E5=8F=96=E6=B6=88=E5=8F=82=E6=95=B0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=20--SysUserServiceImpl.java=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/admin/contrloler/AdminController.java | 8 ++++---- .../java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java | 3 --- .../modules/sys/service/impl/SysUserServiceImpl.java | 7 ++++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java index 7e2c7b1e..ee46f2eb 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java @@ -44,7 +44,7 @@ public class AdminController { AdminPageUserDTO dto = new AdminPageUserDTO(); dto.setMobile((String) params.get("mobile")); dto.setLimit((String) params.get(Constant.LIMIT)); - dto.setPage((String) params.get(Constant.PAGE)); + dto.setPage((String) params.get("pages")); ValidatorUtils.validateEntity(dto); PageData page = sysUserService.page(dto); @@ -54,10 +54,10 @@ public class AdminController { @PutMapping("/users/{id}") @Operation(summary = "重置密码") @RequiresPermissions("sys:role:superAdmin") - public Result update( + public Result update( @PathVariable Long id) { - sysUserService.resetPassword(id); - return new Result<>(); + String password = sysUserService.resetPassword(id); + return new Result().ok(password); } @DeleteMapping("/users/{id}") diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java index 537a5bb9..8c0ab77c 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java @@ -15,14 +15,11 @@ public class AdminPageUserDTO { @Schema(description = "手机号码") - @NotBlank(message = "") private String mobile; @Schema(description = "页数") - @NotBlank(message = "") private String page; @Schema(description = "显示列数") - @NotBlank(message = "") private String limit; } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java index 72ab062a..60959ffc 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java @@ -3,6 +3,7 @@ package xiaozhi.modules.sys.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import xiaozhi.common.constant.Constant; @@ -141,11 +142,11 @@ public class SysUserServiceImpl extends BaseServiceImpl page = baseDao.selectPage( - getPage(params, "sort", true), + getPage(params, "id", true), //定义查询条件 new QueryWrapper() - //必须按照ttsID查找 - .eq("username",dto.getMobile())); + //必须按照手机号码查找 + .eq(StringUtils.isNotBlank(dto.getMobile()),"username",dto.getMobile())); List list = page.getRecords().stream().map(user -> { AdminPageUserVO adminPageUserVO = new AdminPageUserVO(); adminPageUserVO.setUserid(user.getId().toString());