登录修改

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -246,12 +246,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         //先验证账号
         List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>()
-                .eq(User::getStaffNo,account).eq(BaseEntity::getDeleted,false));
+                .eq(User::getStaffNo,account).eq(BaseEntity::getDeleted,false).eq(User::getResignState,false));
 
         if (CollectionUtils.isEmpty(users)) {
             //如果账号未查询到，再用姓名尝试
             users = userMapper.selectList(new LambdaQueryWrapper<User>()
-                    .eq(User::getName,account).eq(BaseEntity::getDeleted,false));
+                    .eq(User::getName,account).eq(BaseEntity::getDeleted,false).eq(User::getResignState,false));
 
             if (users.size() > 1) {
                 ErrorCode.throwBusinessException(CUSTOM_ERROR,"存在多个姓名相同的用户，请使用工号登录。");