bug修复

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

@@ -12,10 +12,13 @@ import org.dromara.mall.api.domain.member.RemoteMemberSave;
 import org.dromara.mall.api.member.RemoteMemberService;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.bo.RemoteUserBo;
+import org.dromara.system.api.model.LoginUser;
 import org.dromara.system.api.model.XcxLoginUser;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 import static org.dromara.common.core.constant.TenantConstants.DEFAULT_TENANT_ID;
 import static org.dromara.common.core.utils.ServletUtils.getClientIP;
 
@@ -48,11 +51,17 @@ public abstract class AbstractMallStrategy implements IAuthStrategy {
             remoteUserBo.setNickName(remoteUserBo.getUserName());
             remoteUserBo.setUserType(UserType.APP_USER.getUserType());
             remoteUserBo.setPhonenumber(loginUser.getPhone());
+
+            LoginUser userInfo = remoteUserService.getUserInfo(remoteUserBo.getUserName(), remoteUserBo.getTenantId(), remoteUserBo.getUserType());
+            if (Objects.nonNull(userInfo)){
+                thirdUserId = userInfo.getUserId();
+            }else {
                 try {
                     thirdUserId = remoteUserService.registerUserInfo(remoteUserBo);
                 } catch (Exception e) {
                     log.info("用户已存在：{}，租户id:{}", remoteUserBo.getUserName(), remoteUserBo.getTenantId());
-                thirdUserId = remoteUserService.getUserInfo(remoteUserBo.getUserName(), remoteUserBo.getTenantId(), UserType.APP_USER.getUserType()).getUserId();
+                    thirdUserId = remoteUserService.getUserInfo(remoteUserBo.getUserName(), remoteUserBo.getTenantId(), remoteUserBo.getUserType()).getUserId();
+                }
             }
         }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -211,7 +211,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
             }
             return userMapper.exists(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUserName, sysUserBo.getUserName())
-                .eq(StringUtils.isNotEmpty(remoteUserBo.getUserType()), SysUser::getUserType, remoteUserBo.getUserType())
+                .eq(SysUser::getUserType, remoteUserBo.getUserType())
             );
         });
         if (exist) {

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

@@ -176,7 +176,7 @@ public class SysUserServiceImpl implements ISysUserService {
         SysTenant sysTenant = TenantHelper.ignore(() -> sysTenantMapper.selectOne(SysTenant::getTenantId, tenantId));
         return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber)
             .eq(SysUser::getTenantId, tenantId)
-            .eq(SysUser::getUserType, Boolean.TRUE.equals(sysTenant.getVirtual()) ? UserType.SYS_USER.getUserType() : UserType.APP_USER.getUserType())
+            .eq(SysUser::getUserType, Boolean.TRUE.equals(sysTenant.getVirtual()) ? UserType.APP_USER.getUserType() : UserType.SYS_USER.getUserType())
         );
     }
 

ruoyi-modules/ruoyi-system/src/main/resources/application.yml

@@ -32,3 +32,6 @@ spring:
       - optional:nacos:application-common.yml
       - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl