suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #21 into master from cc_20260105_fix

Browse Source 
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
This commit is contained in:
苏竹红
2026-01-05 09:07:48 +00:00
parent f6b2b4ccf5
commit 679b697b1b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -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);
}
//其他角色能看到