diff --git a/air/src/main/java/com/air/housing/entity/HousingEstates.java b/air/src/main/java/com/air/housing/entity/HousingEstates.java index cb9fb75..5a029a7 100644 --- a/air/src/main/java/com/air/housing/entity/HousingEstates.java +++ b/air/src/main/java/com/air/housing/entity/HousingEstates.java @@ -1,5 +1,6 @@ package com.air.housing.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java index 4ec6eac..687e768 100644 --- a/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java +++ b/air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java @@ -1,6 +1,7 @@ package com.air.housing.service.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.air.enums.BlocksOriginStatusEnum; import com.air.housing.dto.HousingDefine; import com.air.housing.entity.Blocks; @@ -21,6 +22,7 @@ import com.air.origin.entity.HousesOrigin; import com.air.origin.service.BlocksOriginService; import com.air.origin.service.HousesOriginService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cinderella.framework.common.core.exception.BusinessException; @@ -107,7 +109,7 @@ public class HousingEstatesServiceImpl extends ServiceImpllambdaQuery().eq(LandListed::getAnnoId,housingEstates.getAnnoId())); + LandListed landListed = landListedService.getOne(Wrappers.lambdaQuery().eq(StringUtils.isNotBlank(String.valueOf(housingEstates.getAnnoId())),LandListed::getAnnoId,housingEstates.getAnnoId())); HousingEstatesDetail detail = new HousingEstatesDetail(); detail.setHousingEstates(housingEstates); detail.setLandListed(landListed); diff --git a/air/src/main/java/com/air/housing/vo/HousingEstatesDetail.java b/air/src/main/java/com/air/housing/vo/HousingEstatesDetail.java index 0ae27c9..5e8285d 100644 --- a/air/src/main/java/com/air/housing/vo/HousingEstatesDetail.java +++ b/air/src/main/java/com/air/housing/vo/HousingEstatesDetail.java @@ -6,6 +6,8 @@ import com.air.land.entity.LandListed; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * @ClassName HousingEstatesDetail * @Author Lenovo 102306 diff --git a/air/src/main/java/com/air/land/controller/AuctionRecordController.java b/air/src/main/java/com/air/land/controller/AuctionRecordController.java index 57776f4..36083f3 100644 --- a/air/src/main/java/com/air/land/controller/AuctionRecordController.java +++ b/air/src/main/java/com/air/land/controller/AuctionRecordController.java @@ -15,9 +15,6 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import sun.jvm.hotspot.debugger.Page; - -import java.util.List; /**