diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/LocalDevUserContextConfig.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/LocalDevUserContextConfig.java
index 04deac1..b22129b 100644
--- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/LocalDevUserContextConfig.java
+++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/LocalDevUserContextConfig.java
@@ -46,10 +46,8 @@ public class LocalDevUserContextConfig implements WebMvcConfigurer {
             @Override
             public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
                 String orgInfoId = request.getHeader("orgInfoId");
-                if (StringUtils.hasText(orgInfoId)) {
+                if (StringUtils.hasText(orgInfoId) && !"undefined".equals(orgInfoId)) {
                     ThreadLocalUserInfoAdapter.set(Long.valueOf(orgInfoId));
-                } else if (defaultOrgId != null && defaultOrgId > 0) {
-                    ThreadLocalUserInfoAdapter.set(defaultOrgId);
                 }
                 return true;
             }
@@ -59,6 +57,6 @@ public class LocalDevUserContextConfig implements WebMvcConfigurer {
                                 Object handler, Exception exception) {
         ThreadLocalUserInfoAdapter.clear();
     }
-}).addPathPatterns(LOCAL_DEV_PATHS).excludePathPatterns("/**/getInfo/**");
+}).addPathPatterns(LOCAL_DEV_PATHS).excludePathPatterns("/**/getInfo/**").excludePathPatterns("/**/org-info/**");
     }
 }
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java
index 26ef125..67c3cf9 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java
@@ -79,8 +79,10 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
             dataObject.setState(0);
         }
         InsertFieldDefaults.apply(dataObject);
-        dataObject.setCreateId(entity.getRegisterUserId());
-        dataObject.setUpdateId(entity.getRegisterUserId());
+        if (entity.getRegisterUserId() != null) {
+            dataObject.setCreateId(entity.getRegisterUserId());
+            dataObject.setUpdateId(entity.getRegisterUserId());
+        }
         orgInfoMapper.insert(dataObject);
         entity.setId(dataObject.getId());
         return entity;