From 2feeab89a8c715b245b421a364713e3cc041a150 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 14:21:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 16 +++++++++++-----
1 files changed, 11 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 1cdea41..0d6540d 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -76,7 +76,7 @@
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc","[+"+ Utils.getStaName(siteId)+"+]");
+ map.put("desc", Utils.getStaName(siteId));
result.add(map);
}
@@ -89,10 +89,16 @@
// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
+ for (Map<String, Object> map1: result){
+ if (map1.get(siteId) == null){
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", Utils.getStaName(siteId));
+ result.add(map);
+ }
+
+ }
+
}
return R.ok().add(result);
}
--
Gitblit v1.9.1