数据字典判空
This commit is contained in:
+12
-8
@@ -92,16 +92,20 @@ public class DictAspect {
|
|||||||
((IPage) ((Result) result).getResult()).setRecords(items);
|
((IPage) ((Result) result).getResult()).setRecords(items);
|
||||||
}else if(((Result) result).getResult() instanceof List){
|
}else if(((Result) result).getResult() instanceof List){
|
||||||
String cut = ((Result) result).getCut();
|
String cut = ((Result) result).getCut();
|
||||||
//返回结果中只处理实体对象的不处理map
|
//返回结果中只处理实体对象的不处理其他类型
|
||||||
String name = ((ArrayList) ((Result) result).getResult()).get(0).getClass().getName();
|
if(((List) ((Result) result).getResult()).size() != 0){
|
||||||
if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name)){
|
String name = ((ArrayList) ((Result) result).getResult()).get(0).getClass().getName();
|
||||||
List<JSONObject> items = new ArrayList<>();
|
if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name) && !"java.lang.String".equals(name)){
|
||||||
for (Object record : (List)((Result) result).getResult()) {
|
List<JSONObject> items = new ArrayList<>();
|
||||||
JSONObject item = getJsonObject(record,cut);
|
for (Object record : (List)((Result) result).getResult()) {
|
||||||
items.add(item);
|
JSONObject item = getJsonObject(record,cut);
|
||||||
|
items.add(item);
|
||||||
|
}
|
||||||
|
((Result) result).setResult(items);
|
||||||
}
|
}
|
||||||
((Result) result).setResult(items);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user