From 3a9fe80b5d1c64f2524cea925a463a851ba65c72 Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Tue, 7 Feb 2023 21:01:16 +0800 Subject: [PATCH] =?UTF-8?q?v1.3.1=20=E4=BF=AE=E5=A4=8D=E5=85=AB=E5=AD=97?= =?UTF-8?q?=E8=BD=AC=E9=98=B3=E5=8E=86=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E4=BB=8D=E7=84=B6=E6=9C=89=E9=81=97=E6=BC=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nlf/calendar/Solar.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nlf/calendar/Solar.java b/src/main/java/com/nlf/calendar/Solar.java index a973507..b6448ae 100644 --- a/src/main/java/com/nlf/calendar/Solar.java +++ b/src/main/java/com/nlf/calendar/Solar.java @@ -293,9 +293,13 @@ public class Solar { offsetYear += 60; } int startYear = today.getYear() - offsetYear - 1; - while (startYear >= baseYear) { + while (true) { years.add(startYear); startYear -= 60; + if (startYear < baseYear) { + years.add(baseYear); + break; + } } int hour = 0; String timeZhi = timeGanZhi.substring(1);