diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java index 0a011e4ef..0848cad57 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java @@ -60,14 +60,12 @@ public class InvestCustomerEntity extends InvestBaseEntity { */ @io.swagger.annotations.ApiModelProperty(value = "客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败", name = "type") @LogColumn - @TableField(strategy = FieldStrategy.IGNORED) private EnumCustomerType type; /** * 客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙 */ @io.swagger.annotations.ApiModelProperty(value = "客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙", name = "rating") @LogColumn - @TableField(strategy = FieldStrategy.IGNORED) private EnumCustomerRatingType rating; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java index 2d2fbf390..54d3358e8 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java @@ -34,7 +34,6 @@ public class InvestDemandEntity extends InvestBaseEntity { */ @io.swagger.annotations.ApiModelProperty(value = "负责人", name = "owner") @LogColumn - @TableField(strategy = FieldStrategy.IGNORED) private Long owner; /** * 客户ID 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 4674112a2..32e5f6eb1 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 @@ -93,13 +93,16 @@ public class InvestBizServiceImpl implements InvestBizService { List demandList = demandService.list(new LambdaQueryWrapper<>(demandParams)); LambdaQueryWrapper 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);