From b32f51ef9033af6a310eaafc508b54b3bb9625c2 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 21 Feb 2024 17:04:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9F=A5=E8=AF=A2=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

---
 .../kicc/system/api/devtools/entity/GenQueryType.java     | 7 ++-----
 .../devtools/controller/GenQueryTypeController.java       | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenQueryType.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenQueryType.java
index 5fd173f0..2d99ec84 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenQueryType.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GenQueryType.java
@@ -1,14 +1,11 @@
 package com.cloud.kicc.system.api.devtools.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.kicc.common.data.entity.CommonEntity;
-import java.io.Serializable;
+import com.cloud.kicc.common.data.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
@@ -24,7 +21,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("sys_gen_query_type")
 @ApiModel(value = "GenQueryType对象", description = "查询类型")
-public class GenQueryType extends CommonEntity {
+public class GenQueryType 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/GenQueryTypeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenQueryTypeController.java
index 081ad862..fdf4900c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenQueryTypeController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenQueryTypeController.java
@@ -1,6 +1,5 @@
 package com.cloud.kicc.system.devtools.controller;
 
-
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,7 +11,6 @@ import com.cloud.kicc.system.devtools.service.IGenQueryTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Arrays;
 
 /**
@@ -23,7 +21,7 @@ import java.util.Arrays;
  * @author wangxiang4
  * @since 2023-12-09
  */
-@Controller
+@RestController
 @RequestMapping(AppConstants.APP_SYSTEM + "/devtools/genQueryType")
 @RequiredArgsConstructor
 public class GenQueryTypeController {
@@ -32,7 +30,9 @@ public class GenQueryTypeController {
 
     private LambdaQueryWrapper<GenQueryType> getQueryWrapper(GenQueryType genQueryType) {
         return new LambdaQueryWrapper<GenQueryType>()
-                .like(StrUtil.isNotBlank(genQueryType.getLabel()), GenQueryType::getLabel, genQueryType.getLabel());
+                .like(StrUtil.isNotBlank(genQueryType.getLabel()), GenQueryType::getLabel, genQueryType.getLabel())
+                .like(StrUtil.isNotBlank(genQueryType.getValue()), GenQueryType::getValue, genQueryType.getValue())
+                .orderByAsc(GenQueryType::getSort);
     }
 
     @GetMapping("/list")