diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 03eaffbf2..e03dd767c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -6,7 +6,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; -import com.iformall.enums.EnumRentContractStatus; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxPropertyContractService; @@ -18,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -51,15 +51,9 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract data.put("rent", rent); WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.select(wxPropertyContractQuery).parallelStream() - .filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || - p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || - p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) - .findFirst().orElse(null); - data.put("property", null); - if (wxPropertyContract != null) { - Map property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); - data.put("property", property); + List propertyContracts = wxPropertyContractMapper.select(wxPropertyContractQuery); + if (!propertyContracts.isEmpty()) { + data.put("property", propertyContracts.get(0)); } return new ResultData(data); }