From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 61014eb..ee4e08f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -8,6 +8,7 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditUserDto;
import com.ruoyi.system.dto.UpAndDownDTO;
+import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
@@ -93,8 +94,8 @@
@ApiOperation(value = "删除人员")
@PostMapping(value = "/api/t-app-user/delUser")
public R<?> delUser(@RequestBody String param) {
- String id = JSON.parseObject(param, String.class);
- TAppUser appUser = appUserService.getById(id);
+ UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
+ TAppUser appUser = appUserService.getById(dto.getId());
appUser.setDisabled(true);
appUserService.updateById(appUser);
return R.ok();
@@ -124,8 +125,8 @@
@ApiOperation(value = "重置密码")
@PostMapping(value = "/api/t-app-user/resetPwd")
public R<?> resetPwd(@RequestBody String param) {
- String id = JSON.parseObject(param, String.class);
- TAppUser appUser = appUserService.getById(id);
+ UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
+ TAppUser appUser = appUserService.getById(dto.getId());
String pwd = SecurityUtils.encryptPassword("123456");
appUser.setPassword(pwd);
appUserService.updateById(appUser);
@@ -154,8 +155,8 @@
@ApiOperation(value = "获取人员审核管理详情", response = TAppUserPageVo.class)
@PostMapping(value = "/api/t-app-user/auditDetail")
public R<TAppUserPageVo> auditDetail(@RequestBody String param) {
- String id = JSON.parseObject(param, String.class);
- return R.ok(appUserService.pageAuditDetail(id));
+ UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
+ return R.ok(appUserService.pageAuditDetail(dto.getId()));
}
--
Gitblit v1.7.1