From 4ce96cd01cad74baf570451a8148f4f9f6904263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 21 Apr 2023 14:39:52 +0800 Subject: [PATCH] 'commit' --- .../com/dsideal/FengHuang/Yp/Model/YpModel.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java index 149a7d4..6b0e2a4 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java @@ -119,16 +119,13 @@ public class YpModel { String st = year - start_year_num + start_month_day; String ed = year - end_year_num + end_month_day; if (birth.compareTo(st) >= 0 && birth.compareTo(ed) <= 0) { - break; + kv.set("bx_id", bx_id); + kv.set("bx_name", bx_name); + return kv; } } - if (bx_id == -2) { - kv.set("bx_id", -2); - kv.set("bx_name", "出生日期不在指定的时间段内"); - return kv; - } - kv.set("bx_id", bx_id); - kv.set("bx_name", bx_name); + kv.set("bx_id", -2); + kv.set("bx_name", "出生日期不在指定的时间段内"); return kv; }