From b6b8384bc7fa35d019252847c51ce58668f8ff9b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 20 Mar 2024 16:28:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=98=E6=9B=B4DictAspect.java?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/aspect/DictAspect.java  | 16 ++++++++--------
 .../controller/MemberStatisticsController.java   |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
index bda3db8a..d6931bf0 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
@@ -106,13 +106,6 @@ public class DictAspect {
                     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 = translate(record);
-                    items.add(item);
-                }
-                ((Result) result).setResult(items);
             }else {
                 Object record = (Object) ((Result) result).getResult();
                 ObjectMapper mapper = new ObjectMapper();
@@ -161,7 +154,14 @@ public class DictAspect {
      * @param result
      */
     private void parseMethodDictText(Object result) {
-        if (result instanceof Result) {
+        if (((Result) result).getResult() instanceof List){
+            List<JSONObject> items = new ArrayList<>();
+            for (Object record :(List) ((Result) result).getResult()) {
+                JSONObject item = translate(record);
+                items.add(item);
+            }
+            ((Result) result).setResult(items);
+        } else if (result instanceof Result) {
             Object result1 = ((Result<Object>) result).getResult();
             String jsonStr = JSONUtil.toJsonStr(result1);
             if (JSONUtil.isJsonObj(jsonStr)) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
index b7a8b989..9bfeb8f3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.Dict;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.PasswordUtil;
 import com.jero.member.entity.TbMemberProjectSubitem;
@@ -39,6 +41,7 @@ public class MemberStatisticsController {
         return Result.OK(lineChartVO);
     }
 
+    @DictPoint
     @ApiOperation(value = "饼图")
     @GetMapping(value = "/pieChart")
     public Result<List<MemberPieChartVO>> pieChart() {