diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 117ec5732..24f6ff1e7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -228,22 +228,19 @@ public class DeskServiceImpl implements DeskService { public PageInfo payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); PageInfo pageInfo = new PageInfo<>(); - if (CollectionUtils.isNotEmpty(userRoleIds) - && (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) - || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) - )) { - pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()), Boolean.TRUE); + List subStageStatusList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(userRoleIds)) { + if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { + subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { + subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); + } + if (!subStageStatusList.isEmpty()) { + pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, + subStageStatusList, Boolean.TRUE); + } } - if (CollectionUtils.isNotEmpty(userRoleIds) - && (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) - || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) - )) { - pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.TRUE); - } - - List list = pageInfo.getList(); if (CollectionUtils.isEmpty(list)) { return pageInfo;