优化获取用户信息逻辑

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

@@ -660,14 +660,18 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         if (!StringUtils.isBlank(username)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantData1(username, tenantId);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantData(username, tenantId);
             }
         } else if (!StringUtils.isBlank(phone)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantDataOne1(tenantId, phone);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantDataOne(tenantId, phone);
             }
@@ -675,7 +679,9 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         if (Objects.isNull(sysUser)) {
             if (!StringUtils.isBlank(method) && method.equals("switch")){
                 sysUser = userMapper.selectUserTenantDataOne1(tenantId, username);
-                sysUser.setTenantId(tenantId);
+                if(sysUser != null){
+                    sysUser.setTenantId(tenantId);
+                }
             }else {
                 sysUser = userMapper.selectUserTenantDataOne(tenantId, username);
             }