店铺对应的推广用户-选择框联动修改

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -196,6 +196,8 @@ public class CustomerService {
             //如果有区域则查区域店铺
             List<PoiStore> shops = poiStoreService.getRegionShop(regionId);
             shopIds = shops.stream().map(p -> p.getId()).collect(Collectors.toSet());
+            List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
+            shopIds.retainAll(userAllShops);
         }else{
             //查询用户权限店铺
             shopIds = new HashSet<>(privilageDomainService.listUserDatePermission(userId));

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<Long> 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();
         }

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<PoiStore> stores = poiStoreService.getRegionShop(regionId);
-            shopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList());
+            List<Long> regionShopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList());
+            shopIds.retainAll(regionShopIds);
         }else{
             //什么都没有就全查
             shopIds = privilageDomainService.listUserDatePermission(userId);

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<PoiStore> getRegionShop(long userId,Long regionId){
-        List<PoiStore> poiStores;
+        List<PoiStore> poiStores = new ArrayList<>();
-        if(null == regionId){
         //找到店铺集合
         List<Long> shopsIds = privilageDomainService.listUserDatePermission(userId);
+        if(null == regionId){
             poiStores = poiStoreDOMapper.selectBatchIds(shopsIds);
         }else{
-            poiStores = poiStoreDOMapper.selectRegionShop(regionId);
+            List<PoiStore> regionPoiStores = poiStoreDOMapper.selectRegionShop(regionId);
+            for(PoiStore item : regionPoiStores){
+                shopsIds.contains(item.getId());
+                poiStores.add(item);
+            }
         }
         return poiStores;
     }