解决 冲突

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantConfigMapper.xml

@@ -29,10 +29,10 @@
     </resultMap>
     <select id="getTenantConfig" resultType="com.usky.system.service.vo.SysTenantConfigVo">
         SELECT
-        b.*
+        b.id as id,a.id as tenantId,ifNULL(b.login_title,a.tenant_name) as loginTitle,b.login_logo,b.login_back_url,b.login_footer,b.login_type,b.label_icon
         FROM
         sys_tenant AS a
-        JOIN sys_tenant_config AS b ON a.id = b.tenant_id
+        LEFT JOIN sys_tenant_config AS b ON a.id = b.tenant_id
         <where>
             a. STATUS = 0
             AND a.domain = #{url}

usky-common/usky-common-security/src/main/java/com/usky/common/security/interceptor/HeaderInterceptor.java

@@ -52,7 +52,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor
             SecurityContextHolder.setUserName(userName);
             SecurityContextHolder.setUserKey(userKey);
             SecurityContextHolder.setTenantId(tenantId);
-
+            log.info("userId:{},userName:{},tenantId:{}",userId,userName,tenantId);
             //TODO 2022-05-03 gez 每次请求都要从rdis获取用户信息，并刷新时间，这个代码拉低每次请求效率
             // 如果不影响其它业务模块，考虑去掉这块逻辑
             LoginUser loginUser = AuthUtil.getLoginUser(token);