From 28630a015ee530dc14373976b066578f929620d1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 14:39:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WorkController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index de977e4..47fc6fb 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -67,12 +67,12 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite() {
- Set<Map<String, Object>> result = new HashSet<>();
+ Set<Map<String, Object>> result = new TreeSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
//RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
wrapper.eq("type_no", 101);
- wrapper.orderBy("stn_no", false);
+ wrapper.orderBy("stn_no", true);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
// List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
// List<Integer> outSite = basDevpService.getAvailableOutSite(101);
@@ -85,6 +85,7 @@
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
wrapper2.eq("type_no", 103);
+ wrapper.orderBy("stn_no", true);
List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
// List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
--
Gitblit v1.9.1