From 04d6bbf838f13a893c9c5e25a8ec54c1e6f73b61 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 21 Feb 2024 12:09:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8E=A5=E5=8F=A3compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devtools/controller/GencodeCustomFieldController.java | 4 +++- .../devtools/controller/GencodeCustomObjController.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomFieldController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomFieldController.java index 244a44ab..20d46ef7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomFieldController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomFieldController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.system.api.devtools.entity.GenTableFieldType; import com.cloud.kicc.system.api.devtools.entity.GencodeCustomField; import com.cloud.kicc.system.devtools.service.IGencodeCustomFieldService; import lombok.RequiredArgsConstructor; @@ -29,7 +30,8 @@ public class GencodeCustomFieldController { private LambdaQueryWrapper getQueryWrapper(GencodeCustomField gencodeCustomField) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(gencodeCustomField.getName()), GencodeCustomField::getName, gencodeCustomField.getName()); + .like(StrUtil.isNotBlank(gencodeCustomField.getName()), GencodeCustomField::getName, gencodeCustomField.getName()) + .orderByAsc(GencodeCustomField::getSort); } @GetMapping("/list") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java index 2ddf9f1f..3d2d69f9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java @@ -35,7 +35,8 @@ public class GencodeCustomObjController { private LambdaQueryWrapper getQueryWrapper(GencodeCustomObj gencodeCustomObj) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(gencodeCustomObj.getLabel()), GencodeCustomObj::getLabel, gencodeCustomObj.getLabel()); + .like(StrUtil.isNotBlank(gencodeCustomObj.getLabel()), GencodeCustomObj::getLabel, gencodeCustomObj.getLabel()) + .orderByAsc(GencodeCustomObj::getSort); } @GetMapping("/list")