From 8f420250646ac21718274e7f97ac54982157c958 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 28 Apr 2026 14:14:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 10 +++--- .../system/domain/SysUserRequest.java | 34 +++++++++++++++++++ .../platform/system/service/IUserService.java | 2 +- .../system/service/impl/UserServiceImpl.java | 15 +++++--- .../resources/mapper/system/SysUserMapper.xml | 1 + 5 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java diff --git a/backend/src/main/java/com/yfd/platform/system/controller/UserController.java b/backend/src/main/java/com/yfd/platform/system/controller/UserController.java index 6c9d287..6a569ae 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/UserController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/UserController.java @@ -6,6 +6,7 @@ import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.datasource.DataSource; import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.domain.SysUserRequest; import com.yfd.platform.system.service.IUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -205,8 +206,9 @@ public class UserController { @PostMapping("/auditUser") @Operation(summary = "审核用户注册") @ResponseBody - public ResponseResult auditUser(@RequestParam String userId, - @RequestParam Integer auditStatus) { + public ResponseResult auditUser(@RequestBody SysUserRequest sysUserRequest) { + String userId = sysUserRequest.getUserId(); + Integer auditStatus = sysUserRequest.getRegStatus(); if (userId == null || userId.isEmpty()) { return ResponseResult.error("用户ID不能为空"); } @@ -224,8 +226,8 @@ public class UserController { @GetMapping("/queryPendingAuditUsers") @Operation(summary = "查询待审核用户列表") @ResponseBody - public ResponseResult queryPendingAuditUsers(Page page) { - Page result = userService.queryPendingAuditUsers(page); + public ResponseResult queryPendingAuditUsers(Page page,String name,String regStatus) { + Page result = userService.queryPendingAuditUsers(page,name,regStatus); return ResponseResult.successData(result); } } diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java b/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java new file mode 100644 index 0000000..d1847ac --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java @@ -0,0 +1,34 @@ +package com.yfd.platform.system.domain; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SysUserRequest { + + /** + * 用户ID + */ + private String userId; + + /** + * 用户ID + */ + private List userIds; + + /** + * 审核状态 + */ + private Integer regStatus; + + /** + * 审批意见 + */ + private String commentInfo; +} diff --git a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java index f86da52..266b4e1 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java +++ b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java @@ -170,6 +170,6 @@ public interface IUserService extends IService { *page 分页参数 * 返回值说明: 待审核用户分页列表 ************************************/ - Page queryPendingAuditUsers(Page page); + Page queryPendingAuditUsers(Page page,String name, String regStatus); } diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java index 537a57f..5831e27 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java @@ -18,6 +18,7 @@ import com.yfd.platform.system.mapper.SysRoleMapper; import com.yfd.platform.system.mapper.SysUserMapper; import com.yfd.platform.system.service.IUserService; import com.yfd.platform.utils.FileUtil; +import com.yfd.platform.utils.SecurityUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import com.yfd.platform.config.FileSpaceProperties; @@ -515,7 +516,7 @@ public class UserServiceImpl extends ServiceImpl impleme Page page) { Page mapPage = sysUserMapper.queryUsers(orgid, username, page); - ;mapPage.getRecords().forEach(record -> { + mapPage.getRecords().forEach(record -> { String id = record.getId(); List sysRoles = sysRoleMapper.getRoleByUserId(id); record.setRoles(sysRoles); @@ -584,7 +585,7 @@ public class UserServiceImpl extends ServiceImpl impleme UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", userId) .set("reg_status", auditStatus) - .set("audit_user", getUsername()) + .set("audit_user", SecurityUtils.getUserId()) .set("audit_time", new Timestamp(System.currentTimeMillis())) .set("lastmodifydate", new Timestamp(System.currentTimeMillis())) .set("lastmodifier", getUsername()); @@ -597,9 +598,15 @@ public class UserServiceImpl extends ServiceImpl impleme } @Override - public Page queryPendingAuditUsers(Page page) { + public Page queryPendingAuditUsers(Page page,String name,String regStatus) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysUser::getRegStatus, 0); + queryWrapper.in(SysUser::getRegStatus, 0,1,2); + queryWrapper.eq(SysUser::getRegStatus, regStatus); + queryWrapper.and(StrUtil.isNotBlank(name), wrapper -> + wrapper.like(SysUser::getNickname, name) + .or() + .like(SysUser::getRealName, name) + ); queryWrapper.orderByDesc(SysUser::getRegTime); return this.page(page, queryWrapper); } diff --git a/backend/src/main/resources/mapper/system/SysUserMapper.xml b/backend/src/main/resources/mapper/system/SysUserMapper.xml index dfc56f0..ac59b81 100644 --- a/backend/src/main/resources/mapper/system/SysUserMapper.xml +++ b/backend/src/main/resources/mapper/system/SysUserMapper.xml @@ -70,6 +70,7 @@ FROM sys_user u where 1=1 + and (u.REG_STATUS!=0 and u.REG_STATUS !=2) and u.usertype != 0 and u.orgid = #{orgid}