From 5f1306d6ac9a64991383c02d96d504004b53c2f9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十二月 2023 10:52:34 +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