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 workPlaceCodes = null; -// List 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 workPlaceCodes = null; + List 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 orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest); PageInfo pageInfo = new PageInfo<>(orderResponses);