From a9a4f3849e83305f67ca067930ce49aa28fcb7f2 Mon Sep 17 00:00:00 2001 From: han0 Date: Wed, 19 Mar 2025 11:04:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=90=E6=96=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/controller/MaterialController.java | 6 ++---- src/main/java/mjkf/xinke/main/service/PdfService.java | 4 ---- .../java/mjkf/xinke/main/service/PricePublishService.java | 2 +- .../java/mjkf/xinke/main/service/PriceResultService.java | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java index 2762b0e..e67871a 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java @@ -70,14 +70,12 @@ public class MaterialController { @ApiParam(value = "类型") @RequestParam("type") String type ) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); -// query.eq(Material::getIsTree, 0); -// if (parentId != null) { -// query.eq(Material::getParentId, parentId); -// } query.eq(Material::getType, type); if (keyWord != null && ObjectUtil.isNotEmpty(keyWord)) { query.like(Material::getName, keyWord); } + query.orderByAsc(Material::getSort) + .orderByAsc(Material::getId); var result = materialService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); diff --git a/src/main/java/mjkf/xinke/main/service/PdfService.java b/src/main/java/mjkf/xinke/main/service/PdfService.java index dbd8f05..cfc446a 100644 --- a/src/main/java/mjkf/xinke/main/service/PdfService.java +++ b/src/main/java/mjkf/xinke/main/service/PdfService.java @@ -1,13 +1,9 @@ package mjkf.xinke.main.service; - -import cn.hutool.core.io.FileUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import mjkf.xinke.common.cache.CommonCacheOperator; -import mjkf.xinke.common.exception.CommonException; import mjkf.xinke.main.common.property.ApiHostProperty; import org.springframework.stereotype.Service; diff --git a/src/main/java/mjkf/xinke/main/service/PricePublishService.java b/src/main/java/mjkf/xinke/main/service/PricePublishService.java index 3169702..58140cf 100644 --- a/src/main/java/mjkf/xinke/main/service/PricePublishService.java +++ b/src/main/java/mjkf/xinke/main/service/PricePublishService.java @@ -42,7 +42,7 @@ public class PricePublishService extends ServiceImpl, P query.eq(PricePublish::getSpec, spec); } - query.orderByDesc(Material::getSort); + query.orderByAsc(Material::getSort); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/PriceResultService.java b/src/main/java/mjkf/xinke/main/service/PriceResultService.java index 2d91d04..5845342 100644 --- a/src/main/java/mjkf/xinke/main/service/PriceResultService.java +++ b/src/main/java/mjkf/xinke/main/service/PriceResultService.java @@ -30,7 +30,7 @@ public class PriceResultService extends ServiceImpl, Pri query.like(PriceResult::getName, name); } - query.orderByDesc(Material::getSort); + query.orderByAsc(Material::getSort); return query; }