diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ActionServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ActionServiceImpl.java
index b4940d818..e15a7b196 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ActionServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ActionServiceImpl.java
@@ -152,7 +152,6 @@ public class ActionServiceImpl implements ActionService {
                 .set(ActionDO::getStatus, nextStatus.getIndex())
                 .set(ActionDO::getOperateTime, now)
                 .eq(ActionDO::getId, action.getId())
-                .eq(ActionDO::getTenantId, header.getTenantId())
                 .eq(ActionDO::getUserId, header.getUserId())
                 .eq(ActionDO::getStatus, AgenticActionStatusEnum.PENDING.getIndex())
                 .and(wrapper -> wrapper.isNull(ActionDO::getExpireTime)
@@ -178,7 +177,6 @@ public class ActionServiceImpl implements ActionService {
     private LambdaQueryWrapper<ActionDO> scopedWrapper(RequestHeader.PrincipalHeader header) {
         return Wrappers.<ActionDO>query()
                 .lambda()
-                .eq(ActionDO::getTenantId, header.getTenantId())
                 .eq(ActionDO::getUserId, header.getUserId());
     }
 
diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/AttachmentServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/AttachmentServiceImpl.java
index aacef05ea..e49b40f48 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/AttachmentServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/AttachmentServiceImpl.java
@@ -108,7 +108,6 @@ public class AttachmentServiceImpl implements AttachmentService {
         LambdaQueryWrapper<AttachmentDO> wrapper = Wrappers.<AttachmentDO>query()
                 .lambda()
                 .eq(AttachmentDO::getConversationId, conversationId)
-                .eq(AttachmentDO::getTenantId, header.getTenantId())
                 .eq(AttachmentDO::getUserId, header.getUserId())
                 .orderByDesc(AttachmentDO::getCreateTime);
         return attachmentBuilder.buildBOListByDOList(attachmentManager.list(wrapper));
@@ -122,7 +121,6 @@ public class AttachmentServiceImpl implements AttachmentService {
         LambdaQueryWrapper<AttachmentDO> wrapper = Wrappers.<AttachmentDO>query()
                 .lambda()
                 .in(AttachmentDO::getId, attachmentIds)
-                .eq(AttachmentDO::getTenantId, header.getTenantId())
                 .eq(AttachmentDO::getUserId, header.getUserId());
         List<AttachmentDO> attachments = attachmentManager.list(wrapper);
         if (attachments.isEmpty()) {
diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/MessageServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/MessageServiceImpl.java
index d6bfec9c5..52008dc9a 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/MessageServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/MessageServiceImpl.java
@@ -73,7 +73,6 @@ public class MessageServiceImpl implements MessageService {
         LambdaQueryWrapper<MessageDO> wrapper = Wrappers.<MessageDO>query()
                 .lambda()
                 .eq(MessageDO::getConversationId, conversationId)
-                .eq(MessageDO::getTenantId, header.getTenantId())
                 .eq(MessageDO::getUserId, header.getUserId())
                 .orderByAsc(MessageDO::getCreateTime)
                 .orderByAsc(MessageDO::getId);
diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelConfigServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelConfigServiceImpl.java
index 854e144df..6860bc60e 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelConfigServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelConfigServiceImpl.java
@@ -200,7 +200,6 @@ public class ModelConfigServiceImpl implements ModelConfigService {
         }
         modelConfigManager.update(Wrappers.<ModelConfigDO>lambdaUpdate()
                 .set(ModelConfigDO::getDefaultFlag, DefaultFlagEnum.NOT_DEFAULT.getIndex())
-                .eq(ModelConfigDO::getTenantId, entityDO.getTenantId())
                 .eq(ModelConfigDO::getDefaultFlag, DefaultFlagEnum.DEFAULT.getIndex())
                 .ne(ModelConfigDO::getId, entityDO.getId()));
     }
diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelProviderServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelProviderServiceImpl.java
index 9d8e694df..eca31c1e3 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelProviderServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/ModelProviderServiceImpl.java
@@ -151,7 +151,6 @@ public class ModelProviderServiceImpl implements ModelProviderService {
         }
         modelProviderManager.update(Wrappers.<ModelProviderDO>lambdaUpdate()
                 .set(ModelProviderDO::getDefaultFlag, DefaultFlagEnum.NOT_DEFAULT.getIndex())
-                .eq(ModelProviderDO::getTenantId, entityDO.getTenantId())
                 .eq(ModelProviderDO::getDefaultFlag, DefaultFlagEnum.DEFAULT.getIndex())
                 .ne(ModelProviderDO::getId, entityDO.getId()));
     }
diff --git a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/SessionServiceImpl.java b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/SessionServiceImpl.java
index 838d4e412..6559d67a9 100644
--- a/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/SessionServiceImpl.java
+++ b/dc3-common/dc3-common-agentic/src/main/java/io/github/pnoker/common/agentic/service/impl/SessionServiceImpl.java
@@ -173,7 +173,6 @@ public class SessionServiceImpl implements SessionService {
 
     private LambdaQueryWrapper<SessionDO> fuzzyQuery(SessionQuery query) {
         LambdaQueryWrapper<SessionDO> wrapper = Wrappers.<SessionDO>query().lambda();
-        wrapper.eq(Objects.nonNull(query.getTenantId()), SessionDO::getTenantId, query.getTenantId());
         wrapper.eq(FieldUtil.isValidIdField(query.getUserId()), SessionDO::getUserId, query.getUserId());
         wrapper.like(StringUtils.isNotEmpty(query.getConversationId()), SessionDO::getConversationId,
                 query.getConversationId());