From 200acf9283ff06e75874df263b1e125a71e76215 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 27 十月 2023 14:57:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java index c2cbed1..28fb52d 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java @@ -143,6 +143,13 @@ integralGoodsOfSearch.setPage(page); integralGoodsOfSearch.setObjType(UserExt.getUser().getObjectType()); integralGoodsOfSearch.setObjId(UserExt.getUser().getObjectId()); + if (UserExt.getUser().getObjectType()==2){ + // 查询这个运营商下的所有门店 + List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>() + .eq("operatorId", UserExt.getUser().getObjectId())).stream().map(TStore::getId) + .collect(Collectors.toList()); + integralGoodsOfSearch.setStoreIds(operatorId); + } return pointMercharsClient.ticketList(integralGoodsOfSearch); } -- Gitblit v1.7.1