From 29216768e1d0e8e9d9dffc8f82d661af77940f45 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sat, 17 May 2025 23:18:19 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=99=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/xiaozhi/modules/model/dto/ModelProviderDTO.java   | 1 -
 .../xiaozhi/modules/model/entity/ModelProviderEntity.java  | 3 ---
 .../model/service/impl/ModelProviderServiceImpl.java       | 7 +++++--
 main/xiaozhi-server/config/logger.py                       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java
index fdb33960..26df9a01 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java
@@ -16,7 +16,6 @@ import xiaozhi.common.annotation.UpdateGroup;
 @Data
 @Schema(description = "模型供应器/商")
 public class ModelProviderDTO implements Serializable {
-    //
     @Schema(description = "主键")
     @NotBlank(message = "id不能为空", groups = UpdateGroup.class)
     private String id;
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java
index 0509e09c..00904759 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java
@@ -3,10 +3,8 @@ package xiaozhi.modules.model.entity;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -30,7 +28,6 @@ public class ModelProviderEntity {
     private String name;
 
     @Schema(description = "供应器字段列表(JSON格式)")
-//    @TableField(typeHandler = JacksonTypeHandler.class)
     private String fields;
 
     @Schema(description = "排序")
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 3ea21367..e7899672 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
@@ -59,7 +59,9 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
         }
 
         if (StringUtils.isNotBlank(modelProviderDTO.getName())) {
-            wrapper.like("name", "%" + modelProviderDTO.getName() + "%");
+            wrapper.and(w -> w.like("name", modelProviderDTO.getName())
+                    .or()
+                    .like("provider_code", modelProviderDTO.getName()));
         }
         return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class);
     }
@@ -93,7 +95,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("修改数据失败");
         }
         return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
diff --git a/main/xiaozhi-server/config/logger.py b/main/xiaozhi-server/config/logger.py
index 8866b1a8..5588e00f 100644
--- a/main/xiaozhi-server/config/logger.py
+++ b/main/xiaozhi-server/config/logger.py
@@ -4,7 +4,7 @@ from loguru import logger
 from config.config_loader import load_config
 from config.settings import check_config_file
 
-SERVER_VERSION = "0.4.3"
+SERVER_VERSION = "0.4.4"
 
 
 def get_module_abbreviation(module_name, module_dict):