From 1c655c20cafbcc2b1bf10d1b1ff24e977d27b750 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 15 Apr 2022 16:43:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/aspect/DictAspect.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java index 3b2d5d8c3..a9dca7586 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java @@ -92,16 +92,20 @@ public class DictAspect { ((IPage) ((Result) result).getResult()).setRecords(items); }else if(((Result) result).getResult() instanceof List){ String cut = ((Result) result).getCut(); - //返回结果中只处理实体对象的不处理map - String name = ((ArrayList) ((Result) result).getResult()).get(0).getClass().getName(); - if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name)){ - List items = new ArrayList<>(); - for (Object record : (List)((Result) result).getResult()) { - JSONObject item = getJsonObject(record,cut); - items.add(item); + //返回结果中只处理实体对象的不处理其他类型 + if(((List) ((Result) result).getResult()).size() != 0){ + String name = ((ArrayList) ((Result) result).getResult()).get(0).getClass().getName(); + if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name) && !"java.lang.String".equals(name)){ + List items = new ArrayList<>(); + for (Object record : (List)((Result) result).getResult()) { + JSONObject item = getJsonObject(record,cut); + items.add(item); + } + ((Result) result).setResult(items); } - ((Result) result).setResult(items); } + + } } }