From 03dcd0bc163ae9f482d6bab90ad2e4af824c864e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 4 Mar 2025 16:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BCBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datastore/OfficeServiceImpl.java | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java index caa6b566d..1c53e47dc 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/OfficeServiceImpl.java @@ -157,32 +157,34 @@ public class OfficeServiceImpl implements OfficeService { query.setPager(pager); query.setTable("latest_seawater"); seawaters = seawaterService.findSeawatersByQuery(query); - for (Seawater seawater : seawaters) { - boolean sameFloorDesc = false; + if (StringUtils.isNotBlank(query.getFitment()) && StringUtils.isNotBlank(query.getDirection())) { + for (Seawater seawater : seawaters) { + boolean sameFloorDesc = false; + + if (seawater.getFloorInfo() != null && floorDesc != null) { + if (seawater.getFloorInfo().contains(floorDesc)) { + sameFloorDesc = true; + } else { + try { + Integer floor = Integer.parseInt(seawater.getFloorInfo()); + if (floor <= 6 && "低".equals(floorDesc)) { + sameFloorDesc = true; + } else if (floor > 6 && floor <= 15 && "中".equals(floorDesc)) { + sameFloorDesc = true; + } else if (floor > 15 && "高".equals(floorDesc)) { + sameFloorDesc = true; + } + } catch (Exception ex) { - if (seawater.getFloorInfo() != null) { - if (seawater.getFloorInfo().contains(floorDesc)) { - sameFloorDesc = true; - } else { - try { - Integer floor = Integer.parseInt(seawater.getFloorInfo()); - if (floor <= 6 && "低".equals(floorDesc)) { - sameFloorDesc = true; - } else if (floor > 6 && floor <= 15 && "中".equals(floorDesc)) { - sameFloorDesc = true; - } else if (floor > 15 && "高".equals(floorDesc)) { - sameFloorDesc = true; } - } catch (Exception ex) { - } } - } - if (sameFloorDesc) { - selectedSeawaters.add(seawater); - } - if (selectedSeawaters.size() == 3) { - return getOfficeEvaluationDto(selectedSeawaters, evaluation); + if (sameFloorDesc) { + selectedSeawaters.add(seawater); + } + if (selectedSeawaters.size() == 3) { + return getOfficeEvaluationDto(selectedSeawaters, evaluation); + } } } // 查找基准价