From 5911405b38e2d5237da3a3d6a0b40a033024e93e Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 11 Mar 2025 20:58:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=20=E5=8C=BB=E4=BF=9D=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoCollectOrderBackupController.java       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index 283f1c903..4207ebb88 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
@@ -50,22 +50,22 @@ public class IoCollectOrderBackupController extends BaseController {
     @PostMapping("/udiwms/basic/collect/orderFinish/filter")
     public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
-//        List<Long> workPlaceCodes = null;
-//        List<UserWorkResponse> page;
-//        if (collectOrderRequest.getWorkPlaceCode() == null) {
-//            Long userId = getUserId();
-//            BasicCollectUserRequest request = new BasicCollectUserRequest();
-//            request.setPage(1);
-//            request.setLimit(100);
-//            request.setUserId(userId.toString());
-//            page = basicCollectUserService.filterList(request);
-//            if (page != null) {
-//                workPlaceCodes = page.stream()
-//                        .map(UserWorkResponse::getWorkplaceId)
-//                        .collect(Collectors.toList());
-//            }
-//            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
-//        }
+        List<Long> workPlaceCodes = null;
+        List<UserWorkResponse> page;
+        if (collectOrderRequest.getWorkPlaceCode() == null) {
+            Long userId = getUserId();
+            BasicCollectUserRequest request = new BasicCollectUserRequest();
+            request.setPage(1);
+            request.setLimit(100);
+            request.setUserId(userId.toString());
+            page = basicCollectUserService.filterList(request);
+            if (page != null) {
+                workPlaceCodes = page.stream()
+                        .map(UserWorkResponse::getWorkplaceId)
+                        .collect(Collectors.toList());
+            }
+            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
+        }
         log.error("collectOrderRequest"+collectOrderRequest);
         List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
         PageInfo<IoCollectOrderResponse> pageInfo = new PageInfo<>(orderResponses);