From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 08 五月 2025 09:21:57 +0800 Subject: [PATCH] bug修改 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java index f31c09d..c468218 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java @@ -221,11 +221,16 @@ @RequestMapping("/siteDetailsOfSearch") @ResponseBody public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){ + Integer storeId = null; if (UserExt.getUser().getObjectType()== 2){ // 筛选这个运营商下的门店 operatorId = UserExt.getUser().getObjectId(); } - List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName); + if (UserExt.getUser().getObjectType()== 3){ + // 筛选这个运营商下的门店 + storeId = UserExt.getUser().getObjectId(); + } + List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId); if (storeList.size() > 0 ){ for (Map<String, Object> stringObjectMap : storeList) { String provinceName = (String) stringObjectMap.get("province"); @@ -320,15 +325,12 @@ @RequestMapping(value = "/listRecord") @ResponseBody public Object listRecord(Integer id,String name, Integer type, String phone) { - Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(); List<TAppUser> tAppUsers = appUserClient.queryByNamePhone(new QueryByNamePhone(name, phone)); if(tAppUsers.size()==0){ return new ArrayList<>(); } CouponRecordQuery ofSearch = new CouponRecordQuery(); ofSearch.setId(id); - ofSearch.setLimit(page.getSize()); - ofSearch.setOffset(page.getCurrent()); ofSearch.setIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList())); ofSearch.setType(type); List<Map<String, Object>> maps = client.listRecord(ofSearch); -- Gitblit v1.7.1