Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

This commit is contained in:
苏竹红
2024-05-10 10:22:59 +08:00

View File

@@ -442,13 +442,14 @@ public class DecorationServiceImpl implements DecorationService {
for (String authRegionId : authRegionIds) {
regions.add(Long.parseLong(authRegionId));
}
PageHelper.startPage(request.getPageNum(), request.getPageSize());
if (regions.isEmpty()) {
log.info("该用户下权限没有管理区域");
return null;
return new PageInfo<>();
}
List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>();
//shopId,lineid,regionid,shopname,storenum,
PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, request.getSubStageStatus());
PageInfo pageInfo = new PageInfo<>(shopInfoDOS);
if (shopInfoDOS.isEmpty()) {