timi/timi-spring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix getLanguage NPE

Browse Source
This commit is contained in:
Timi
2025-12-22 10:52:18 +08:00
parent 4f0d2a380b
commit 5fe610120b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/imyeyu/spring/TimiSpring.java
View File

@ -356,7 +356,10 @@ public class TimiSpring {
public static Language.Enum getLanguage() { public static Language.Enum getLanguage() {
String name = getRequestArg("lang"); String name = getRequestArg("lang");
if (TimiJava.isEmpty(name)) { 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) { for (Locale.LanguageRange item : rangeList) {
if (item.getRange().contains("-")) { if (item.getRange().contains("-")) {
name = item.getRange(); name = item.getRange();

2
src/main/java/com/imyeyu/spring/bean/Page.java
View File

@ -61,7 +61,7 @@ public class Page<T> extends BasePage {
} }
public void addOrder(String field, BaseMapper.OrderType orderType) { 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); orderMap.put(Text.camelCase2underscore(field), orderType);
} }
} }