|
|
|
@@ -93,13 +93,16 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
List<InvestDemandEntity> demandList = demandService.list(new LambdaQueryWrapper<>(demandParams)); |
|
|
|
LambdaQueryWrapper<InvestCustomerEntity> queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams); |
|
|
|
if (Objects.isNull(InvestUserContext.getDataUser())) { |
|
|
|
queryWrapperCustomer.in(ObjectUtils.allNotNull(params.getDemandOwner()), |
|
|
|
InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
if (CollectionUtils.isEmpty(demandList) && Objects.nonNull(params.getDemandOwner())) { |
|
|
|
return investPage; |
|
|
|
} else { |
|
|
|
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (CollectionUtils.isEmpty(demandList)) { |
|
|
|
return investPage; |
|
|
|
} else { |
|
|
|
queryWrapperCustomer.in(InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
} |
|
|
|
} |
|
|
|
queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate); |
|
|
|
|