解决冲突并调整手机号登录

base-modules/service-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java

@@ -2,12 +2,14 @@ package com.ruoyi.job.mapper;
 
 import java.util.List;
 import com.ruoyi.job.domain.SysJob;
+import org.springframework.stereotype.Repository;
 
 /**
  * 调度任务信息 数据层
  * 
  * @author ruoyi
  */
+@Repository
 public interface SysJobMapper
 {
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -523,7 +523,10 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
            sysUser = userMapper.selectUserDataOne(tenantId,phone);
        }
        if(Objects.isNull(sysUser)){
-           throw new BusinessException("用户信息未注册");
+           sysUser = userMapper.selectUserDataOne(tenantId,username);
+           if (Objects.isNull(sysUser)){
+               throw new BusinessException("用户信息未注册");
+           }
        }
        List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
        List<SysRoleVO> collect = sysRoles.stream().map(sysRole -> {