From a1959b8752fd91cdc29cc89040001b5d2773a833 Mon Sep 17 00:00:00 2001 From: wangweijia <495720349@qq.com> Date: Fri, 10 Apr 2020 16:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=94=A8=E6=88=B7-=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A1=86=E8=81=94=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kiisoo/ic/customer/CustomerService.java | 2 ++ .../com/kiisoo/ic/region/service/RegionService.java | 4 ++-- .../kiisoo/ic/store/service/PoiSellerService.java | 5 ++++- .../kiisoo/ic/store/service/PoiStoreService.java | 13 +++++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 56faae3..f4f92b2 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -196,6 +196,8 @@ public class CustomerService { //如果有区域则查区域店铺 List shops = poiStoreService.getRegionShop(regionId); shopIds = shops.stream().map(p -> p.getId()).collect(Collectors.toSet()); + List userAllShops = privilageDomainService.listUserDatePermission(userId); + shopIds.retainAll(userAllShops); }else{ //查询用户权限店铺 shopIds = new HashSet<>(privilageDomainService.listUserDatePermission(userId)); diff --git a/src/main/java/com/kiisoo/ic/region/service/RegionService.java b/src/main/java/com/kiisoo/ic/region/service/RegionService.java index a0d655f..2317638 100644 --- a/src/main/java/com/kiisoo/ic/region/service/RegionService.java +++ b/src/main/java/com/kiisoo/ic/region/service/RegionService.java @@ -71,14 +71,14 @@ public class RegionService { //找到用户所属角色 PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectRoleByUserId(userId); - /*//店长 + //店长 if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) { //找到店铺所属区域 List shopIdList = poiStoreStaffDOMapper.selectByUserId(userId); userRegions = getShopRegion(shopIdList); } //运营人员 - else*/ if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) { + else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) { //找到所有区域 userRegions = getAllRegion(); } diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java index 2b23348..182cc00 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java @@ -45,9 +45,12 @@ public class PoiSellerService { //有店铺就用店铺 shopIds.add(shopId); }else if(regionId != null){ + //什么都没有就全查 + shopIds = privilageDomainService.listUserDatePermission(userId); //有区域就查区域店铺 List stores = poiStoreService.getRegionShop(regionId); - shopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList()); + List regionShopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList()); + shopIds.retainAll(regionShopIds); }else{ //什么都没有就全查 shopIds = privilageDomainService.listUserDatePermission(userId); diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index 8214ade..7bdedf6 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -10,6 +10,7 @@ import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -40,13 +41,17 @@ public class PoiStoreService { * @param regionId */ public List getRegionShop(long userId,Long regionId){ - List poiStores; + List poiStores = new ArrayList<>(); + //找到店铺集合 + List shopsIds = privilageDomainService.listUserDatePermission(userId); if(null == regionId){ - //找到店铺集合 - List shopsIds = privilageDomainService.listUserDatePermission(userId); poiStores = poiStoreDOMapper.selectBatchIds(shopsIds); }else{ - poiStores = poiStoreDOMapper.selectRegionShop(regionId); + List regionPoiStores = poiStoreDOMapper.selectRegionShop(regionId); + for(PoiStore item : regionPoiStores){ + shopsIds.contains(item.getId()); + poiStores.add(item); + } } return poiStores; }