From 07bd9630a79b18812490d7f43fad6b17348d2b93 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 10 Feb 2025 17:16:19 +0800 Subject: [PATCH] fix payFranchiseFeesPendingList --- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 dbaecc3df..db7e5735a 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 @@ -230,13 +230,13 @@ public class DeskServiceImpl implements DeskService { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); PageInfo pageInfo = new PageInfo<>(); if (CollectionUtils.isNotEmpty(userRoleIds) - || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode()) + && (userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode()) ||userRoleIds.contains(UserRoleEnum.INVESTMENT_COMMISSIONER.getCode()) - ||userRoleIds.contains(UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER.getCode())){ + ||userRoleIds.contains(UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER.getCode()))){ pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, Collections.singletonList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()), Boolean.FALSE); } - if (CollectionUtils.isNotEmpty(userRoleIds)|| userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())){ + if (CollectionUtils.isNotEmpty(userRoleIds)&& userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())){ pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, Collections.singletonList(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.TRUE); }