diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java index b54e23d1a..2dfca0361 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo.invest; import com.iformall.enums.EnumCustomerType; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestDemandQuery extends InvestPageQuery { /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowQuery.java index 6d830a63f..f7e0f14c8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowQuery.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo.invest; import com.iformall.enums.EnumFollowType; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestFollowQuery extends InvestPageQuery { /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestMessageQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestMessageQuery.java index cade23000..192e48f75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestMessageQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestMessageQuery.java @@ -1,8 +1,10 @@ package com.iformall.domain.vo.invest; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestMessageQuery extends InvestPageQuery { /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestOperateRecordQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestOperateRecordQuery.java index b0de0b110..79290d3a9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestOperateRecordQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestOperateRecordQuery.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo.invest; import com.iformall.enums.EnumFollowType; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestOperateRecordQuery extends InvestPageQuery { /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java index e6b5c7269..276dd1dc2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo.invest; import com.iformall.enums.EnumRemindDateType; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestRemindQuery extends InvestPageQuery { /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskQuery.java index 7c909b84f..7c588e9b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskQuery.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo.invest; import com.iformall.enums.EnumTaskStatus; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class InvestTaskQuery extends InvestPageQuery { @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 97831fa6a..c796f97ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -64,21 +64,27 @@ public class InvestBizServiceImpl implements InvestBizService { customerParams = queryParams.getCustomer(); demandParams = queryParams.getDemand(); } - InvestPageResult investPage = new InvestPageResult<>(); - - LambdaQueryWrapper queryWrapperDemand = new LambdaQueryWrapper<>(demandParams); - InvestPageResult customers = customerService.queryPage(buildPageQuery(params, customerParams)); - if (CollectionUtils.isEmpty(customers.getRecords())) { - return investPage; + List demandList = demandService.list(new LambdaQueryWrapper<>(demandParams)); + LambdaQueryWrapper queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams); + InvestPageResult customers; + if (Objects.isNull(InvestUserContext.getDataUser())) { + queryWrapperCustomer.in(ObjectUtils.allNotNull(params.getDemandOwner()),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); + } else { + if(CollectionUtils.isEmpty(demandList)) { + return investPage; + } else { + queryWrapperCustomer.in(InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); + } } - queryWrapperDemand.in(InvestDemandEntity::getCustomerId, getIds(customers.getRecords(), InvestCustomerEntity::getId)); - - List demandList = demandService.list(queryWrapperDemand); - + customers = customerService.queryPage(buildPageQuery(params, null), queryWrapperCustomer); List resultList = getTargeInfoList(demandList, customers.getRecords()); BeanUtils.copyProperties(customers, investPage); investPage.setRecords(resultList); + if (CollectionUtils.isEmpty(customers.getRecords())) { + return investPage; + } + return investPage; }