From 5fe610120b6eaa39cff162b72c8f2a0c538a93b8 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Mon, 22 Dec 2025 10:52:18 +0800
Subject: [PATCH] fix getLanguage NPE

---
 src/main/java/com/imyeyu/spring/TimiSpring.java | 5 ++++-
 src/main/java/com/imyeyu/spring/bean/Page.java  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/imyeyu/spring/TimiSpring.java b/src/main/java/com/imyeyu/spring/TimiSpring.java
index 85a6c9b..2c83f2e 100644
--- a/src/main/java/com/imyeyu/spring/TimiSpring.java
+++ b/src/main/java/com/imyeyu/spring/TimiSpring.java
@@ -356,7 +356,10 @@ public class TimiSpring {
 	public static Language.Enum getLanguage() {
 		String name = getRequestArg("lang");
 		if (TimiJava.isEmpty(name)) {
-			List<Locale.LanguageRange> rangeList = Locale.LanguageRange.parse(getLanguageRaw());
+			name = getLanguageRaw();
+		}
+		if (TimiJava.isNotEmpty(name)) {
+			List<Locale.LanguageRange> rangeList = Locale.LanguageRange.parse(name);
 			for (Locale.LanguageRange item : rangeList) {
 				if (item.getRange().contains("-")) {
 					name = item.getRange();
diff --git a/src/main/java/com/imyeyu/spring/bean/Page.java b/src/main/java/com/imyeyu/spring/bean/Page.java
index 6340c45..032b7f2 100644
--- a/src/main/java/com/imyeyu/spring/bean/Page.java
+++ b/src/main/java/com/imyeyu/spring/bean/Page.java
@@ -61,7 +61,7 @@ public class Page<T> extends BasePage {
 	}
 
 	public void addOrder(String field, BaseMapper.OrderType orderType) {
-		orderMap = TimiJava.firstNotNull(orderMap, new LinkedHashMap<>());
+		orderMap = TimiJava.defaultIfNull(orderMap, new LinkedHashMap<>());
 		orderMap.put(Text.camelCase2underscore(field), orderType);
 	}
 }