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 3727ab1e0..c64f95a9a 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 @@ -319,8 +319,10 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo trainListPendingList(DeskRequest deskRequest, LoginUserInfo user) { - return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_5, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE); + /// 如果是管理员则查询所有 其他角色查询管 + Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); + return commonPendingVOPageInfo(deskRequest, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_5, + Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), isAdmin ? Boolean.FALSE : Boolean.TRUE); } @Override