@ -1,7 +1,6 @@
@@ -1,7 +1,6 @@
package com.cloud.kicc.workflow.override ;
import org.flowable.idm.api.User ;
import org.flowable.ui.common.security.SecurityUtils ;
import com.cloud.kicc.common.data.entity.KiccUser ;
import org.flowable.ui.common.tenant.TenantProvider ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@ -24,12 +23,12 @@ public class UiTenantProvider implements TenantProvider {
@@ -24,12 +23,12 @@ public class UiTenantProvider implements TenantProvider {
@Override
public String getTenantId ( ) {
User flowableUser = SecurityUtils . getCurrent UserObject ( ) ;
if ( flowable User ! = null ) {
KiccUser kiccUser = com . cloud . kicc . common . security . util . SecurityUtils . getUser ( ) ;
if ( kicc User ! = null ) {
// quotes can help solve whitespace issues, trimming here would not
// help solve the problem at source which is in user database
LOGGER . debug ( "Using user tenantId: '{}'" , flowable User. getTenantId ( ) ) ;
return flowable User. getTenantId ( ) ;
LOGGER . debug ( "Using user tenantId: '{}'" , kicc User. getTenantId ( ) ) ;
return kicc User. getTenantId ( ) ;
}
LOGGER . debug ( "No tenantId" ) ;