WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-13 17:49:24 +08:00
parent accf99500d 627d2738b7
commit 8bb2f0a47a
24 changed files with 889 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+9 -2
View File
@@ -98,8 +98,15 @@ public class DictAspect {
if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name) && !"java.lang.String".equals(name)){
List<JSONObject> items = new ArrayList<>();
for (Object record : (List)((Result) result).getResult()) {
JSONObject item = getJsonObject(record,cut);
items.add(item);
if("java.util.ArrayList".equals(record.getClass().getName())){
for (Object o : (List) record) {
JSONObject item = getJsonObject(o,cut);
items.add(item);
}
}else{
JSONObject item = getJsonObject(record,cut);
items.add(item);
}
}
((Result) result).setResult(items);
}