fix
This commit is contained in:
@@ -72,22 +72,19 @@ public class StoreServiceImpl implements StoreService {
|
||||
public PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum) {
|
||||
//根据手机号查询 标品userId
|
||||
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
|
||||
if (enterpriseUserDO == null){
|
||||
PageHelper.startPage(pageNum,pageSize);
|
||||
List<MiniShopsResponse> list = storeDao.getSubStoreByRegionIdsAndMobile(null,mobile,storeName,storeNum);
|
||||
return new PageInfo<>(list);
|
||||
}
|
||||
//获取用户职位
|
||||
List<Long> userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId());
|
||||
//查询职位详情,筛选掉店外职位
|
||||
List<SysRoleDO> roleIds = sysRoleDao.selectRoleByRoleIds(userRoleIds);
|
||||
List<SysRoleDO> sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())).collect(Collectors.toList());
|
||||
List<String> regionIds = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(sysRoleDOS)){
|
||||
//获取用户管辖区域
|
||||
List<UserAuthMappingDO> userAuthMapping = userAuthMappingService.listUserAuthMappingByUserId(enterpriseUserDO.getUserId());
|
||||
if (CollectionUtils.isNotEmpty(userAuthMapping)){
|
||||
regionIds.addAll(userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()));
|
||||
if (Objects.nonNull(enterpriseUserDO)){
|
||||
//获取用户职位
|
||||
List<Long> userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId());
|
||||
//查询职位详情,筛选掉店外职位
|
||||
List<SysRoleDO> roleIds = sysRoleDao.selectRoleByRoleIds(userRoleIds);
|
||||
List<SysRoleDO> sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())).collect(Collectors.toList());
|
||||
if (CollectionUtils.isNotEmpty(sysRoleDOS)){
|
||||
//获取用户管辖区域
|
||||
List<UserAuthMappingDO> userAuthMapping = userAuthMappingService.listUserAuthMappingByUserId(enterpriseUserDO.getUserId());
|
||||
if (CollectionUtils.isNotEmpty(userAuthMapping)){
|
||||
regionIds.addAll(userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
}
|
||||
PageHelper.startPage(pageNum,pageSize);
|
||||
|
||||
Reference in New Issue
Block a user