From 3ec0398d30896d3db4b2895b381819fe336a180d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 6 Feb 2025 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8-=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=9C=A8=20SQL=20=E6=B3=A8=E5=85=A5=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/permissions/user/api/UserApi.java     |  3 +--
 .../permissions/user/dto/UserGridRequest.java | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java

diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
index bb655eb437..1432931433 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
@@ -11,7 +11,6 @@ import io.dataease.auth.DeApiPath;
 import io.dataease.auth.DePermit;
 import io.dataease.auth.vo.TokenVO;
 import io.dataease.model.KeywordRequest;
-import io.dataease.request.BaseGridRequest;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -40,7 +39,7 @@ public interface UserApi {
     })
     @DePermit("m:read")
     @PostMapping("/pager/{goPage}/{pageSize}")
-    IPage<UserGridVO> pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request);
+    IPage<UserGridVO> pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody UserGridRequest request);
 
     @Operation(summary = "查询用户详情")
     @Parameter(name = "id", description = "ID", required = true, in = ParameterIn.PATH)
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java
new file mode 100644
index 0000000000..0cefb41d0e
--- /dev/null
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserGridRequest.java
@@ -0,0 +1,20 @@
+package io.dataease.api.permissions.user.dto;
+
+import io.dataease.model.KeywordRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UserGridRequest extends KeywordRequest implements Serializable {
+    private List<Boolean> statusList;
+
+    private List<Integer> originList;
+
+    private List<Long> roleIdList;
+
+    private Boolean timeDesc;
+}