bug修复

ruoyi-auth/src/main/java/org/dromara/auth/service/impl/AbstractMallStrategy.java

@@ -22,7 +22,6 @@ import static org.dromara.common.core.utils.ServletUtils.getClientIP;
 /**
  * @author hzh
  * @date 2025-02-08
- * @desc TODO
  **/
 @Slf4j
 @Service
@@ -53,7 +52,7 @@ public abstract class AbstractMallStrategy implements IAuthStrategy {
                 thirdUserId = remoteUserService.registerUserInfo(remoteUserBo);
             } catch (Exception e) {
                 log.info("用户已存在：{}，租户id:{}", remoteUserBo.getUserName(), remoteUserBo.getTenantId());
-                thirdUserId = remoteUserService.getUserInfo(remoteUserBo.getUserName(), remoteUserBo.getTenantId(), UserType.SYS_USER.getUserType()).getUserId();
+                thirdUserId = remoteUserService.getUserInfo(remoteUserBo.getUserName(), remoteUserBo.getTenantId(), UserType.APP_USER.getUserType()).getUserId();
             }
         }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -60,6 +60,7 @@ public class SysUserServiceImpl implements ISysUserService {
     private final SysPostMapper postMapper;
     private final SysUserRoleMapper userRoleMapper;
     private final SysUserPostMapper userPostMapper;
+    private final SysTenantMapper sysTenantMapper;
     @DubboReference
     private RemoteServerService remoteServerService;
 
@@ -171,8 +172,11 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public SysUserVo selectUserByPhonenumber(String phonenumber, String tenantId) {
+        SysTenant sysTenant = sysTenantMapper.selectById(tenantId);
         return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber)
-            .eq(SysUser::getTenantId, tenantId));
+            .eq(SysUser::getTenantId, tenantId)
+            .eq(SysUser::getUserType, sysTenant.getVirtual() ? UserType.SYS_USER.getUserType() : UserType.APP_USER.getUserType())
+        );
     }
 
     /**