diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenValidateType.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenValidateType.java index bcd024a5..70d71710 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenValidateType.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenValidateType.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_validate_type") @ApiModel(value = "GenValidateType对象", description = "验证类型") -public class GenValidateType extends CommonEntity { +public class GenValidateType extends BaseEntity { private static final long serialVersionUID = 1L; @@ -40,5 +41,4 @@ public class GenValidateType extends CommonEntity { @ApiModelProperty("排序") private Integer sort; - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenValidateTypeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenValidateTypeController.java index 3a9f1ea3..d1c490aa 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenValidateTypeController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenValidateTypeController.java @@ -7,6 +7,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.GenShowType; import com.cloud.kicc.system.api.devtools.entity.GenValidateType; import com.cloud.kicc.system.devtools.service.IGenValidateTypeService; import lombok.RequiredArgsConstructor; @@ -31,7 +32,9 @@ public class GenValidateTypeController { private LambdaQueryWrapper getQueryWrapper(GenValidateType genValidateType) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(genValidateType.getValue()), GenValidateType::getValue, genValidateType.getValue()); + .like(StrUtil.isNotBlank(genValidateType.getLabel()), GenValidateType::getLabel, genValidateType.getLabel()) + .like(StrUtil.isNotBlank(genValidateType.getValue()), GenValidateType::getValue, genValidateType.getValue()) + .orderByAsc(GenValidateType::getSort); } @GetMapping("/list")