数据字典

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java

@@ -84,6 +84,22 @@ public class DictAspect {
             if (((Result) result).getResult() instanceof IPage) {
                 List<JSONObject> items = new ArrayList<>();
                 for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) {
+                    JSONObject item = getJsonObject(record);
+                    items.add(item);
+                }
+                ((IPage) ((Result) result).getResult()).setRecords(items);
+            }else if(((Result) result).getResult() instanceof List){
+                List<JSONObject> items = new ArrayList<>();
+                for (Object record : (List)((Result) result).getResult()) {
+                    JSONObject item = getJsonObject(record);
+                    items.add(item);
+                }
+                ((Result) result).setResult(items);
+            }
+        }
+    }
+
+    private JSONObject getJsonObject(Object record) {
         ObjectMapper mapper = new ObjectMapper();
         String json = "{}";
         try {
@@ -116,12 +132,7 @@ public class DictAspect {
                 item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName()))));
             }
         }
-                    items.add(item);
+        return item;
-                }
-                ((IPage) ((Result) result).getResult()).setRecords(items);
-            }
-
-        }
     }
 
     /**