From 084dbf57d6c158a3bb126e015840498c8c6e0199 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 11 二月 2025 13:09:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5123cc4..7231322 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -78,8 +78,6 @@
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
wrapper2.eq("type_no",103);
List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
@@ -169,13 +167,19 @@
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
+ List<Map<String, Object>> result = new ArrayList<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
wrapper.eq("type_no",110);
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
- List<Integer> collect = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
- return R.ok().add(collect);
+ for (StaDesc staDesc : staDescs) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", staDesc.getStnNo());
+ map.put("desc","["+ Utils.getStaName(staDesc.getStnNo())+"]");
+ result.add(map);
+ }
+ return R.ok().add(result);
// return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
--
Gitblit v1.9.1