v1.3.1 修复八字转阳历极端情况下仍然有遗漏的问题。

6tail · Feb 7, 2023 · 3a9fe80 · 3a9fe80
1 parent 09baeb4
commit 3a9fe80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/nlf/calendar/Solar.java b/src/main/java/com/nlf/calendar/Solar.java
@@ -293,9 +293,13 @@ public static List<Solar> fromBaZi(String yearGanZhi, String monthGanZhi, String
       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);