diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index a342677b7..829c67e85 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -376,16 +376,16 @@ and (a.investment_manager = #{userId} or a.operations_consultant = #{userId}) - and a.region_id in + and ( + a.region_id in #{regionId} - - - and a.invest_region_id in - - #{investRegionId} + or a.invest_region_id in + + #{regionId} + ) order by a.update_time desc diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 1a69c046a..1f24d6a26 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -549,11 +549,7 @@ public class ShopServiceImpl implements ShopService { } List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId); // 招商经理查询招商区域invest_region_id,否则查询运营区域region_id - if (userRoleIds.contains(UserRoleEnum.INVESTMENT_MANGER.getCode())) { - request.setAuthInvestRegionIds(authRegionIds); - } else { - request.setAuthRegionIds(authRegionIds); - } + request.setAuthRegionIds(authRegionIds); } } if (CollectionUtils.isNotEmpty(request.getRegionIds())) {