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 6a569ae..53ee18c 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 @@ -202,7 +202,7 @@ public class UserController { return ResponseResult.success(); } - @Log(module = "系统用户", value = "审核用户注册") +// @Log(module = "系统用户", value = "审核用户注册") @PostMapping("/auditUser") @Operation(summary = "审核用户注册") @ResponseBody @@ -226,7 +226,7 @@ public class UserController { @GetMapping("/queryPendingAuditUsers") @Operation(summary = "查询待审核用户列表") @ResponseBody - public ResponseResult queryPendingAuditUsers(Page page,String name,String regStatus) { + public ResponseResult queryPendingAuditUsers(Page page,String name,Integer regStatus) { Page result = userService.queryPendingAuditUsers(page,name,regStatus); return ResponseResult.successData(result); } 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 5831e27..12e0245 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 @@ -1,9 +1,11 @@ package com.yfd.platform.system.service.impl; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -582,26 +584,26 @@ public class UserServiceImpl extends ServiceImpl impleme @Override public boolean auditUser(String userId, Integer auditStatus) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", userId) - .set("reg_status", auditStatus) - .set("audit_user", SecurityUtils.getUserId()) - .set("audit_time", new Timestamp(System.currentTimeMillis())) - .set("lastmodifydate", new Timestamp(System.currentTimeMillis())) - .set("lastmodifier", getUsername()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(SysUser::getId, userId) + .set(SysUser::getRegStatus, auditStatus) + .set(SysUser::getAuditUser, SecurityUtils.getUserId()) + .set(SysUser::getAuditTime, new Timestamp(System.currentTimeMillis())) + .set(SysUser::getLastmodifydate, new Timestamp(System.currentTimeMillis())) + .set(SysUser::getLastmodifier, SecurityUtils.getCurrentUsername()); if (auditStatus == 1) { - updateWrapper.set("status", 1); + updateWrapper.set(SysUser::getStatus, 1); } else if (auditStatus == 2) { - updateWrapper.set("status", 0); + updateWrapper.set(SysUser::getStatus, 0); } return this.update(updateWrapper); } @Override - public Page queryPendingAuditUsers(Page page,String name,String regStatus) { + public Page queryPendingAuditUsers(Page page,String name,Integer regStatus) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(SysUser::getRegStatus, 0,1,2); - queryWrapper.eq(SysUser::getRegStatus, regStatus); + queryWrapper.eq(ObjectUtil.isNotEmpty(regStatus),SysUser::getRegStatus, regStatus); queryWrapper.and(StrUtil.isNotBlank(name), wrapper -> wrapper.like(SysUser::getNickname, name) .or() diff --git a/backend/src/main/resources/mapper/system/SysUserMapper.xml b/backend/src/main/resources/mapper/system/SysUserMapper.xml index ac59b81..70ac49a 100644 --- a/backend/src/main/resources/mapper/system/SysUserMapper.xml +++ b/backend/src/main/resources/mapper/system/SysUserMapper.xml @@ -69,9 +69,10 @@ u.lastmodifydate FROM sys_user u - where 1=1 - and (u.REG_STATUS!=0 and u.REG_STATUS !=2) - and u.usertype != 0 + WHERE + 1 = 1 + AND ( ( u.REG_STATUS != 0 AND u.REG_STATUS != 2 ) OR u.REG_STATUS IS NULL ) + AND u.usertype != 0 and u.orgid = #{orgid} @@ -81,15 +82,21 @@ ORDER BY u.lastmodifydate DESC