diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index df6cea3c4..dfb5c5a0b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -43,6 +43,7 @@ public enum UserRoleEnum { TENT_PASS_CUSTOMER(380000000L,"营帐通客服"), DESIGN_CUSTOMER(390000000L,"设计客服"), CONSTRUCTION_CUSTOMER(400000000L,"施工客服"), + BRANCH_OFFICE(1724233283449L,"分布内勤"), ; private Long code; 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 80e7dde16..207a9dd20 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 @@ -8,6 +8,7 @@ import com.cool.store.dto.PendingCountDTO; import com.cool.store.dto.DeskStageDTO; import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.entity.*; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.enums.point.PayBusinessTypeEnum; import com.cool.store.enums.point.ShopSubStageEnum; @@ -226,8 +227,12 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { + List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); + if (CollectionUtils.isEmpty(userRoleIds)|| !userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())){ + return new PageInfo<>(); + } PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Arrays.asList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE); + Arrays.asList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.TRUE); List list = pageInfo.getList(); if (CollectionUtils.isEmpty(list)){ return pageInfo;