From e50250449a1d38128d6577917aa033e1414731a9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 14 Jul 2025 19:50:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90AI=20=E5=A4=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E3=80=91UserProfileQueryToolFunction=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/UserProfileQueryToolFunction.java    | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java
index 6e0ba51c9..5656d3929 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import com.fasterxml.jackson.annotation.JsonClassDescription;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -17,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.function.BiFunction;
 
 /**
- * 工具：当前用户信息查询
+ * 工具：用户信息查询
  *
  * 同时，也是展示 ToolContext 上下文的使用
  *
@@ -31,8 +33,17 @@ public class UserProfileQueryToolFunction
     private AdminUserApi adminUserApi;
 
     @Data
-    @JsonClassDescription("当前用户信息查询")
-    public static class Request { }
+    @JsonClassDescription("用户信息查询")
+    public static class Request {
+
+        /**
+         * 用户编号
+         */
+        @JsonProperty(value = "id")
+        @JsonPropertyDescription("用户编号，例如说：1。如果查询自己，则 id 为空")
+        private Long id;
+
+    }
 
     @Data
     @AllArgsConstructor
@@ -61,13 +72,19 @@ public class UserProfileQueryToolFunction
 
     @Override
     public Response apply(Request request, ToolContext toolContext) {
-        LoginUser loginUser = (LoginUser) toolContext.getContext().get(AiUtils.TOOL_CONTEXT_LOGIN_USER);
         Long tenantId = (Long) toolContext.getContext().get(AiUtils.TOOL_CONTEXT_TENANT_ID);
-        if (loginUser == null | tenantId == null) {
-            return null;
+        if (tenantId == null) {
+            return new Response();
+        }
+        if (request.getId() == null) {
+            LoginUser loginUser = (LoginUser) toolContext.getContext().get(AiUtils.TOOL_CONTEXT_LOGIN_USER);
+            if (loginUser == null) {
+                return new Response();
+            }
+            request.setId(loginUser.getId());
         }
         return TenantUtils.execute(tenantId, () -> {
-            AdminUserRespDTO user = adminUserApi.getUser(loginUser.getId());
+            AdminUserRespDTO user = adminUserApi.getUser(request.getId());
             return BeanUtils.toBean(user, Response.class);
         });
     }