From fdbcba7040f4986b96f107ff4a2f98525414fec4 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 21 Feb 2024 16:32:07 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/kicc/system/api/devtools/entity/GenShowType.java | 3 ++- .../system/devtools/controller/GenShowTypeController.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenShowType.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenShowType.java index 34beb17d..579c3232 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenShowType.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenShowType.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system.api.devtools.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.BaseEntity; import com.cloud.kicc.common.data.entity.CommonEntity; import java.io.Serializable; import io.swagger.annotations.ApiModel; @@ -24,7 +25,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @TableName("sys_gen_show_type") @ApiModel(value = "GenShowType对象", description = "控件类型") -public class GenShowType extends CommonEntity { +public class GenShowType extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenShowTypeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenShowTypeController.java index 7639ea5b..cec83ec5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenShowTypeController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenShowTypeController.java @@ -31,7 +31,9 @@ public class GenShowTypeController { private LambdaQueryWrapper getQueryWrapper(GenShowType genShowType) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(genShowType.getLabel()), GenShowType::getLabel, genShowType.getLabel()); + .like(StrUtil.isNotBlank(genShowType.getLabel()), GenShowType::getLabel, genShowType.getLabel()) + .like(StrUtil.isNotBlank(genShowType.getValue()), GenShowType::getValue, genShowType.getValue()) + .orderByAsc(GenShowType::getSort); } @GetMapping("/list")