修改排序的逻辑

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem; 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 
 
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.AllArgsConstructor;
@@ -78,11 +80,23 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(Constant.PAGE, page);
         params.put(Constant.LIMIT, limit);
+        
+        // 不再使用默认的getPage方法，而是直接创建Page对象并自定义排序
+        long curPage = Long.parseLong(page);
+        long pageSize = Long.parseLong(limit);
+        Page<ModelConfigEntity> pageInfo = new Page<>(curPage, pageSize);
+        
+        // 添加排序规则：先按is_enabled降序，再按sort升序
+        pageInfo.addOrder(OrderItem.desc("is_enabled"));
+        pageInfo.addOrder(OrderItem.asc("sort"));
+        
+        // 执行分页查询
         IPage<ModelConfigEntity> modelConfigEntityIPage = modelConfigDao.selectPage(
-                getPage(params, "sort", true),
+                pageInfo,
                 new QueryWrapper<ModelConfigEntity>()
                         .eq("model_type", modelType)
                         .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%"));
+        
         return getPageData(modelConfigEntityIPage, ModelConfigDTO.class);
     }