From b0a1260a566f6c844dd55c67d9587d4753840b0c Mon Sep 17 00:00:00 2001
From: admin <cgf12138@163.com>
Date: 星期三, 28 五月 2025 17:52:29 +0800
Subject: [PATCH] aaa
---
aiflowy-commons/aiflowy-common-web/src/main/java/tech/aiflowy/common/web/controller/BaseCurdController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/aiflowy-commons/aiflowy-common-web/src/main/java/tech/aiflowy/common/web/controller/BaseCurdController.java b/aiflowy-commons/aiflowy-common-web/src/main/java/tech/aiflowy/common/web/controller/BaseCurdController.java
index 876978e..89f0e75 100644
--- a/aiflowy-commons/aiflowy-common-web/src/main/java/tech/aiflowy/common/web/controller/BaseCurdController.java
+++ b/aiflowy-commons/aiflowy-common-web/src/main/java/tech/aiflowy/common/web/controller/BaseCurdController.java
@@ -1,5 +1,7 @@
package tech.aiflowy.common.web.controller;
+import javafx.beans.DefaultProperty;
+import org.springframework.web.bind.annotation.RequestParam;
import tech.aiflowy.common.ai.ChatManager;
import tech.aiflowy.common.ai.util.AiSqlUtil;
import tech.aiflowy.common.domain.Result;
@@ -168,6 +170,30 @@
* @return 鏌ヨ鐨勭粨鏋滈泦
*/
@GetMapping("page")
+ public Result page(HttpServletRequest request, String sortKey, String sortType, Long pageNumber, Long pageSize,
+ @RequestParam(defaultValue = "-1") Integer firstMenuId,
+ @RequestParam(defaultValue = "-1") Integer secondMenuId) {
+ if (pageNumber == null || pageNumber < 1) {
+ pageNumber = 1L;
+ }
+ if (pageSize == null || pageSize < 1) {
+ pageSize = 10L;
+ }
+
+ QueryWrapper queryWrapper = buildQueryWrapper(request);
+ queryWrapper.orderBy(buildOrderBy(sortKey, sortType, getDefaultOrderBy()));
+ if(firstMenuId == -1 && secondMenuId == -1){
+
+ }
+ else if(secondMenuId == -1){
+ if(firstMenuId != -1){
+ queryWrapper.eq("first_menu_id", firstMenuId);
+ }
+ }else{
+ queryWrapper.eq("second_menu_id", secondMenuId);
+ }
+ return Result.success(queryPage(new Page<>(pageNumber, pageSize), queryWrapper));
+ }
public Result page(HttpServletRequest request, String sortKey, String sortType, Long pageNumber, Long pageSize) {
if (pageNumber == null || pageNumber < 1) {
pageNumber = 1L;
@@ -180,7 +206,6 @@
queryWrapper.orderBy(buildOrderBy(sortKey, sortType, getDefaultOrderBy()));
return Result.success(queryPage(new Page<>(pageNumber, pageSize), queryWrapper));
}
-
protected QueryWrapper buildQueryWrapper(HttpServletRequest request) {
--
Gitblit v1.8.0