From 679b697b1b881094ae48ed91ee6178850137d1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <570057076@qq.com>
Date: Mon, 5 Jan 2026 09:07:48 +0000
Subject: [PATCH] Merge #21 into master from cc_20260105_fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fax:订货

* cc_20260105_fix: (2 commits squashed)

  - feat:代办+督导改为招商经理

  - fax:订货

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/21
---
 .../main/java/com/cool/store/service/impl/DeskServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 431122873..d6c1599ce 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
@@ -352,7 +352,7 @@ public class DeskServiceImpl implements DeskService {
         //订单组 只查询待授权的数据
         if (userRoleIds.contains(UserRoleEnum.ORDER_GROUP.getCode())) {
             //只查管辖的待授权的数据
-            return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_17,
+            return commonPendingVOPageInfo(deskRequest,user , ShopSubStageEnum.SHOP_STAGE_17,
                     Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_172.getShopSubStageStatus()), Boolean.TRUE);
         }
         //其他角色能看到