From 665c1b1c485fd06a5620add8340e624f9797431c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 27 Dec 2022 17:38:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=99=BB=E5=BD=95=20=E4=BD=BF=E7=94=A8=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=20=E9=81=BF=E5=85=8D=E5=A4=9A=E6=AC=A1join=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dubbo/RemoteUserServiceImpl.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteUserServiceImpl.java index 74f7f912..c6ef2a10 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteUserServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.dubbo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.enums.UserStatus; import com.ruoyi.common.core.exception.ServiceException; @@ -11,6 +12,7 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.RoleDTO; import com.ruoyi.system.api.model.XcxLoginUser; +import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysPermissionService; import com.ruoyi.system.service.ISysUserService; @@ -33,37 +35,36 @@ public class RemoteUserServiceImpl implements RemoteUserService { private final ISysUserService userService; private final ISysPermissionService permissionService; private final ISysConfigService configService; + private final SysUserMapper userMapper; @Override public LoginUser getUserInfo(String username) throws UserException { - SysUser sysUser = userService.selectUserByUserName(username); + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getUserName, SysUser::getStatus) + .eq(SysUser::getUserName, username)); if (ObjectUtil.isNull(sysUser)) { throw new UserException("user.not.exists", username); } - if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) { - throw new UserException("user.password.delete", username); - } if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) { throw new UserException("user.blocked", username); } // 此处可根据登录用户的数据不同 自行创建 loginUser - return buildLoginUser(sysUser); + return buildLoginUser(userMapper.selectUserByUserName(username)); } @Override public LoginUser getUserInfoByPhonenumber(String phonenumber) throws UserException { - SysUser sysUser = userService.selectUserByPhonenumber(phonenumber); + SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getPhonenumber, SysUser::getStatus) + .eq(SysUser::getPhonenumber, phonenumber)); if (ObjectUtil.isNull(sysUser)) { throw new UserException("user.not.exists", phonenumber); } - if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) { - throw new UserException("user.password.delete", phonenumber); - } if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) { throw new UserException("user.blocked", phonenumber); } // 此处可根据登录用户的数据不同 自行创建 loginUser - return buildLoginUser(sysUser); + return buildLoginUser(userMapper.selectUserByPhonenumber(phonenumber)); } @Override @@ -73,9 +74,6 @@ public class RemoteUserServiceImpl implements RemoteUserService { if (ObjectUtil.isNull(sysUser)) { // todo 用户不存在 业务逻辑自行实现 } - if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) { - // todo 用户已被删除 业务逻辑自行实现 - } if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) { // todo 用户已被停用 业务逻辑自行实现 }