diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java index e0d7210..bb9db25 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java @@ -10,14 +10,6 @@ import java.util.List; @Mapper public interface UserMapper extends BaseMapper { - /** - * 通过工号查询用户 - * - * @param workNumber - * @return - */ - User selectUserByWorkNumber(String workNumber); - /* * 通过用户编码查询用户 * diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index 5bec5a8..f922c55 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -72,9 +72,12 @@ public class UserServiceImpl extends ServiceImpl implements Us public ElectromagneticResult login(UserLoginRequest loginRequest) { UserLoginInfo info = UserMappers.INSTANCE.getUserLoginRequestToModel(loginRequest); String decodePwd = AESUtils.decrypt(info.getUserPwd(), UserConstants.SECRET_KEY); - User user = userMapper.selectUserByWorkNumber(info.getWorkNumber()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(User::getWorkNumber, info.getWorkNumber()) + .eq(User::getEffectFlag, EffectFlagEnum.EFFECT.code); + User user = this.getOne(queryWrapper); if (Objects.isNull(user)) { - return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误"); + return ElectromagneticResultUtil.fail("500", "用户不存在"); } info.setUserId(user.getId()); info.setUsername(user.getUserName()); diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml index 09bc975..083807f 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml @@ -155,11 +155,6 @@ - -