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

Merge branch 'cc_20250612_desk' into 'master'

Browse Source 
加盟费待办增加职位阶段展示对账中

See merge request hangzhou/java/custom_zxjp!114
This commit is contained in:
苏竹红
2025-06-12 09:22:23 +00:00
parent 31e09c0e3f 72d6167104
commit bc95e976ce
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,6 +268,9 @@ public class DeskServiceImpl implements DeskService {
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
} }
if(userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())||userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())){
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus());
}
if (!subStageStatusList.isEmpty()) { if (!subStageStatusList.isEmpty()) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
subStageStatusList, Boolean.TRUE,keyword); subStageStatusList, Boolean.TRUE,keyword);