From 6d89ae1c6682cc6e8482d3f436372e8ba9cf7c10 Mon Sep 17 00:00:00 2001
From: rainv123 <2148537152@qq.com>
Date: Mon, 23 Mar 2026 16:58:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BB=85=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=A8=A1=E5=9E=8B=E8=AF=B4=E6=98=8E=E5=92=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BF=86=E6=A8=A1=E5=9E=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/model/service/impl/ModelConfigServiceImpl.java    | 3 ++-
 .../modules/model/service/impl/ModelProviderServiceImpl.java  | 3 ++-
 .../db/changelog/{202603231036.sql => 202603231037.sql}       | 3 ++-
 .../src/main/resources/db/changelog/db.changelog-master.yaml  | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename main/manager-api/src/main/resources/db/changelog/{202603231036.sql => 202603231037.sql} (73%)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
index 24bdb751..a49ce69c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
@@ -57,7 +57,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                         .eq("model_type", modelType)
                         .eq("is_enabled", 1)
                         .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
-                        .select("id", "model_name"));
+                        .select("id", "model_name")
+                        .orderByAsc("sort"));
         return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
     }
 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
index fe6df77f..85cc85b5 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
@@ -148,7 +148,8 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
         UserDetail user = SecurityUser.getUser();
         modelProviderDTO.setUpdater(user.getId());
         modelProviderDTO.setUpdateDate(new Date());
-        if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
+        if (modelProviderDao
+                .updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
             throw new RenException(ErrorCode.UPDATE_DATA_FAILED);
         }
         return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
diff --git a/main/manager-api/src/main/resources/db/changelog/202603231036.sql b/main/manager-api/src/main/resources/db/changelog/202603231037.sql
similarity index 73%
rename from main/manager-api/src/main/resources/db/changelog/202603231036.sql
rename to main/manager-api/src/main/resources/db/changelog/202603231037.sql
index 686b9b44..5ae1ce2a 100644
--- a/main/manager-api/src/main/resources/db/changelog/202603231036.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202603231037.sql
@@ -1,6 +1,7 @@
+-- 新增仅上报聊天记录记忆模型供应器
 
 delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only';
 delete from `ai_model_config` where `id` = 'Memory_mem_report_only';
 
 INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW());
-INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
\ No newline at end of file
+INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, '仅上报聊天记录，不总结记忆', 3, NULL, NULL, NULL, NULL);
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 0a30c341..f84fdd9d 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -572,9 +572,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202603111131.sql
   - changeSet:
-      id: 202603231036
+      id: 202603231037
       author: rainv123
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202603231036.sql
\ No newline at end of file
+            path: classpath:db/changelog/202603231037.sql