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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
This commit is contained in:
zhangchenbiao
2024-05-29 17:17:51 +08:00
parent 57b5fa2bc4 673edcac23
commit 753f4e24c6
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -46,10 +46,16 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
@Resource
EnterpriseUserRoleMapper enterpriseUserRoleMapper;
@Resource
UserAuthMappingMapper userAuthMappingMapper;
@Resource
private CommonService commonService;
@Resource
RegionMapper regionMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public boolean distribution(TrainingExperienceDistributionRequest request) {
@@ -137,10 +143,18 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
}
List<SysRoleDO> xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames);
List<Long> roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList());
//店长角色的用户id
List<String> userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds);
List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByRoleIdList);
String storeManagers = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString();
leaseBaseInfoDO.setStoreManager(storeManagers);
//当前门店
RegionDO storeRegion = regionMapper.getRegionByStoreId(leaseBaseInfoDO.getStoreId());
//权限
List<String> userIdsByMappingIds = userAuthMappingMapper.getUserIdsByMappingIds(Collections.singletonList(storeRegion.getRegionId()));
//过滤
userIdsByMappingIds.retainAll(userIdsByRoleIdList);
//用户
List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds);
String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString();
leaseBaseInfoDO.setStoreManager(nameList);
return leaseBaseInfoDO;
}