diff --git a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mcp/ScopeToolSyncService.java b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mcp/ScopeToolSyncService.java index ece1aaf..2d02fb4 100644 --- a/xiaoqu-agent-service/src/main/java/me/iiv/agent/mcp/ScopeToolSyncService.java +++ b/xiaoqu-agent-service/src/main/java/me/iiv/agent/mcp/ScopeToolSyncService.java @@ -82,8 +82,12 @@ public class ScopeToolSyncService implements ApplicationRunner { if (toolName.isEmpty()) { continue; } + // soft_delete 在历史数据里可能是 NULL(建表默认 0 但早期插入未写), + // 只按 =0 过滤会把已注册的工具误判为"不存在"而跳过绑定 + // (2026-10-21 district.paper.statistics.query 即因此未绑上)。 Tool tool = toolMapper.selectOne(new LambdaQueryWrapper() - .eq(Tool::getName, toolName).eq(Tool::getSoftDelete, 0)); + .eq(Tool::getName, toolName) + .and(w -> w.eq(Tool::getSoftDelete, 0).or().isNull(Tool::getSoftDelete))); if (tool == null) { log.warn("scope-tool binding 跳过:工具不存在 name={}", toolName); skipped++; diff --git a/xiaoqu-agent-service/src/test/java/me/iiv/agent/mcp/ScopeToolSyncServiceTest.java b/xiaoqu-agent-service/src/test/java/me/iiv/agent/mcp/ScopeToolSyncServiceTest.java index c8c9178..466b356 100644 --- a/xiaoqu-agent-service/src/test/java/me/iiv/agent/mcp/ScopeToolSyncServiceTest.java +++ b/xiaoqu-agent-service/src/test/java/me/iiv/agent/mcp/ScopeToolSyncServiceTest.java @@ -65,6 +65,25 @@ class ScopeToolSyncServiceTest { verify(scopeToolMapper, times(1)).insert(any(ScopeTool.class)); } + @Test + void bindsToolWhoseSoftDeleteColumnIsNull() { + service.rawBindings = "sync=tool.c"; + AgentScope scope = new AgentScope(); + scope.setId(4L); + scope.setCode("sync"); + when(scopeMapper.selectOne(any())).thenReturn(scope); + Tool toolC = new Tool(); + toolC.setId(12L); + toolC.setName("tool.c"); + // softDelete 为 NULL 的历史记录也要能绑上 + when(toolMapper.selectOne(any())).thenReturn(toolC); + when(scopeToolMapper.selectCount(any())).thenReturn(0L); + + service.run(null); + + verify(scopeToolMapper, times(1)).insert(any(ScopeTool.class)); + } + @Test void skipsUnknownScopeWithoutFailing() { service.rawBindings = "nope=tool.a";