diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 8426de4fe..79d47d54a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -222,11 +222,13 @@ xsi.deleted = 0 and xssi.shop_stage = 3 and xssi.shop_sub_stage_status != -100 - and - xsi.region_id in - - #{item} - + + and + xsi.region_id in + + #{item} + + and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like concat("%",#{request.shopKeyword},"%")) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 39f34880b..97b15bc98 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -17,11 +17,8 @@ import com.cool.store.request.PlatformBuildRequest; import com.cool.store.request.platformBuildListRequest; import com.cool.store.response.PlatformBuildListResponse; import com.cool.store.response.PlatformBuildResponse; -import com.cool.store.service.OperationLogService; -import com.cool.store.service.PlatformBuildService; +import com.cool.store.service.*; import com.cool.store.mapper.PlatformBuildMapper; -import com.cool.store.service.RegionService; -import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.StringUtils; import com.cool.store.vo.PartnerUserInfoVO; @@ -52,6 +49,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Service public class PlatformBuildServiceImpl implements PlatformBuildService { + @Resource + private SysRoleService sysRoleService; @Resource private ApplyLicenseMapper applyLicenseMapper; @Resource @@ -280,13 +279,15 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { @Override public PageInfo platformBuildList(platformBuildListRequest request) { String userId = request.getOperateUserId(); - List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); - if (CollectionUtils.isEmpty(regionIds)) { - return new PageInfo<>(); - } List regionIdList = new ArrayList<>(); - for (String regionId : regionIds) { - regionIdList.add(Long.parseLong(regionId)); + if (!sysRoleService.checkIsAdmin(userId)){ + List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); + if (CollectionUtils.isEmpty(regionIds)) { + return new PageInfo<>(); + } + for (String regionId : regionIds) { + regionIdList.add(Long.parseLong(regionId)); + } } List subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds()); if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {