diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
index dd15708bf604e0d79d60a659cf8f79ee96fdf373..681508f92565966a30629bc75b1253962993cf57 100644
--- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
+++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
@@ -162,31 +162,38 @@ public class TenantContext implements Serializable {
     }
 
     public List<ModuleVo> getActiveModuleList() {
-        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
-        return ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
+        if (StringUtils.isNotBlank(this.tenantUuid)) {
+            List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+            return ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
+        }
+        return new ArrayList<>();
     }
 
     public List<ModuleGroupVo> getActiveModuleGroupList() {
-        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
-        //补充framework模块
-        ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
         List<ModuleGroupVo> activeModuleGroupList = new ArrayList<>();
-        for (String group : tenantModuleGroupList) {
-            ModuleGroupVo groupVo = ModuleUtil.getModuleGroup(group);
-            if (groupVo != null) {
-                activeModuleGroupList.add(groupVo);
+        if (StringUtils.isNotBlank(this.tenantUuid)) {
+            List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+            //补充framework模块
+            ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
+            for (String group : tenantModuleGroupList) {
+                ModuleGroupVo groupVo = ModuleUtil.getModuleGroup(group);
+                if (groupVo != null) {
+                    activeModuleGroupList.add(groupVo);
+                }
             }
         }
         return activeModuleGroupList;
     }
 
     public Map<String, ModuleVo> getActiveModuleMap() {
-        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
-        List<ModuleVo> activeModuleList = ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
         Map<String, ModuleVo> activeModuleMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(activeModuleList)) {
-            for (ModuleVo module : activeModuleList) {
-                activeModuleMap.put(module.getId(), module);
+        if (StringUtils.isNotBlank(this.tenantUuid)) {
+            List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+            List<ModuleVo> activeModuleList = ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
+            if (CollectionUtils.isNotEmpty(activeModuleList)) {
+                for (ModuleVo module : activeModuleList) {
+                    activeModuleMap.put(module.getId(), module);
+                }
             }
         }
         return activeModuleMap;
diff --git a/src/main/java/neatlogic/framework/dao/cache/NeatLogicCache.java b/src/main/java/neatlogic/framework/dao/cache/NeatLogicCache.java
index 49ea1800b495f2f4af833f7a8401f4518aa872fc..92af9465b2d1ea0c58f40ff826480f12e6c99cf0 100644
--- a/src/main/java/neatlogic/framework/dao/cache/NeatLogicCache.java
+++ b/src/main/java/neatlogic/framework/dao/cache/NeatLogicCache.java
@@ -45,11 +45,7 @@ public class NeatLogicCache implements Cache {
     }
 
     private synchronized Ehcache getCache() {
-        TenantContext tenantContext = TenantContext.get();
-        String tenant = null;
-        if (tenantContext != null) {
-            tenant = tenantContext.getTenantUuid();
-        }
+        String tenant = TenantContext.get().getTenantUuid();
         if (StringUtils.isNotBlank(tenant)) {
             if (!CACHE_MANAGER.cacheExists(tenant + ":" + id)) {
                 CACHE_MANAGER.addCache(tenant + ":" + id);
diff --git a/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java b/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
index eed2e05690fffbabfa43eb6bd5944b463d56c976..b9f1ce853f92b7cafcbc5c5b40624ee8c4ba876f 100644
--- a/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
+++ b/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
@@ -46,11 +46,7 @@ public class NeatLogicConcurrentSafeCache implements Cache {
     private static final ConcurrentHashMap<String, ReentrantLock> LOCAL_LOCK_MAP = new ConcurrentHashMap<>();
 
     private static String generateLockKey(String id, Object key) {
-        String tenant = null;
-        TenantContext tenantContext = TenantContext.get();
-        if (tenantContext != null) {
-            tenant = tenantContext.getTenantUuid();
-        }
+        String tenant = TenantContext.get().getTenantUuid();
         if (StringUtils.isNotBlank(tenant)) {
             return tenant + ":" + id + ":" + key;
         } else {
@@ -71,11 +67,7 @@ public class NeatLogicConcurrentSafeCache implements Cache {
     }
 
     private synchronized Ehcache getCache() {
-        TenantContext tenantContext = TenantContext.get();
-        String tenant = null;
-        if (tenantContext != null) {
-            tenant = tenantContext.getTenantUuid();
-        }
+        String tenant = TenantContext.get().getTenantUuid();
         if (StringUtils.isNotBlank(tenant)) {
             if (!CACHE_MANAGER.cacheExists(tenant + ":" + id)) {
                 Ehcache ehcache = CACHE_MANAGER.addCacheIfAbsent(tenant + ":" + id);
diff --git a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
index ffbac52ef4de54e7e9588827f2c2d7ae1880c491..dde5dbb9c769028cb36db5661056936f2db0e528 100644
--- a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
+++ b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
@@ -38,9 +38,8 @@ public class TenantConverter extends ClassicConverter implements Serializable {
      */
     @Override
     public String convert(ILoggingEvent event) {
-        TenantContext tenantContext = TenantContext.get();
-        if (tenantContext != null) {
-            return tenantContext.getTenantUuid();
+        if (StringUtils.isNotBlank(TenantContext.get().getTenantUuid())) {
+            return TenantContext.get().getTenantUuid();
         } else {
             Map<String, String> map = event.getMDCPropertyMap();
             String tenant = map.get("tenant");