From f02a461cd0e0c6ad326cd71e3af733e3292407fc Mon Sep 17 00:00:00 2001
From: xiejun <309858992@qq.com>
Date: 星期五, 29 十二月 2023 13:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 1f745af..16dfcc0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -254,6 +254,12 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
+ if(queryObject.getOrder().equals("asc")){
+ query.setAscs(queryObject.getSort());
+ }else{
+ query.setDescs(queryObject.getSort());
+ }
+
IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
return R.data(pages);
}
--
Gitblit v1.9.3