diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
index eb16b1b80..4044a783b 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
@@ -148,17 +148,28 @@ public class ConversationServiceImpl implements ConversationService {
             }
             model = baseModelDO.getModelName();
         }
-        ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();
-        message.setRole("user");
-        message.setContent(chatReqVO.getPrompt());
+
+        List<ModelCompletionsReqVO.ModelCompletionsMessage> messages = new ArrayList<>();
+
+        if(chatReqVO.getSystemPrompt() != null && !chatReqVO.getSystemPrompt().equals("")){
+            ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();
+            message.setRole("system");
+            message.setContent(chatReqVO.getSystemPrompt());
+            messages.add(message);
+        }
+
         // TODO: 聊天推理
         List<String> messageHistoryList = stringRedisTemplate.opsForList().range(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, -1);
-        List<ModelCompletionsReqVO.ModelCompletionsMessage> messages = new ArrayList<>();
         if (messageHistoryList != null && !messageHistoryList.isEmpty()) {
             for (String messageHistory : messageHistoryList) {
                 messages.add(JsonUtils.parseObject(messageHistory, ModelCompletionsReqVO.ModelCompletionsMessage.class));
             }
         }
+
+        ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();
+        message.setRole("user");
+        message.setContent(chatReqVO.getPrompt());
+
         messages.add(message);
         ModelCompletionsReqVO modelCompletionsReqVO = new ModelCompletionsReqVO();
         modelCompletionsReqVO.setMessages(messages);