Browse Source

修改代码逻辑

songyh 3 years ago
parent
commit
3868fb74ad

+ 1 - 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java

@@ -131,14 +131,11 @@ public class DictAspect {
                     items.add(item);
                 }
                 ((IPage) ((Result) result).getResult()).setRecords(items);
-            }else{
+            }else if(((Result) result).getResult() instanceof PageInfo){
                 //返回类型为 pageInfo  list
                /* if (((Result) result).getResult() instanceof List) {
                     return;
                 }*/
-                if (ObjectUtil.isEmpty(((PageInfo) ((Result) result).getResult()))) {
-                    return;
-                }
                 List<JSONObject> items = new ArrayList<>();
                 for (Object record : ((Result<PageInfo>) result).getResult().getList()){
                     ObjectMapper mapper = new ObjectMapper();