|
@@ -362,15 +362,17 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
|
|
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
Page<AppSitePlace> page = new Page<>(dto.getPageNo(), dto.getPageSize());
|
|
|
LambdaQueryWrapper<AppSitePlace> wrapper = Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
|
|
|
-// .eq(AppSitePlace::getSiteId, dto.getSiteId())
|
|
|
.likeRight(AppSitePlace::getOrgCode, loginUser.getOrgCode())
|
|
|
.eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
|
|
|
.like(StringUtils.isNotBlank(dto.getName()), AppSitePlace::getName, dto.getName()).orderByDesc(AppSitePlace::getCreateTime);
|
|
|
-
|
|
|
+ if(null != dto.getSiteId() && !"ALL".equals(dto.getSiteId())){
|
|
|
+ wrapper.eq(AppSitePlace::getSiteId, dto.getSiteId());
|
|
|
+ }
|
|
|
IPage<AppSitePlace> resultPage = baseMapper.selectPage(page, wrapper);
|
|
|
return resultPage.convert(record -> {
|
|
|
AppSitePlaceUnfixedDTO appSitePlaceUnfixedDTO = new AppSitePlaceUnfixedDTO();
|
|
|
BeanUtils.copyProperties(record, appSitePlaceUnfixedDTO);
|
|
|
+ appSitePlaceUnfixedDTO.setVenuesName(appSiteMapper.selectById(record.getSiteId()).getName());
|
|
|
List<AppSitePriceRules> appSitePriceRulesList = appSitePriceRulesMapper.selectList(
|
|
|
Wrappers.<AppSitePriceRules>lambdaQuery().eq(AppSitePriceRules::getSitePlaceId, record.getId()).eq(AppSitePriceRules::getStatus, CommonConstant.STATUS_0_INT));
|
|
|
if (CollUtil.isNotEmpty(appSitePriceRulesList)) {
|