From e42a48f9b3362d8210b1ccaa96cc2352e5086d16 Mon Sep 17 00:00:00 2001
From: FCL <fantoutou@163.com>
Date: Thu, 12 Feb 2026 11:11:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:Dict=E6=B3=A8=E8=A7=A3=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E5=AF=B9=E8=B1=A1=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zt/plat/module/qms/core/aspect/DictAspect.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java
index 316775f0..3b0b0770 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java
@@ -81,8 +81,8 @@ public class DictAspect {
         if (!(result instanceof CommonResult))
             return result;
         Object data = ((CommonResult) result).getData();
-        if (!(data instanceof PageResult<?>) && !(data instanceof ArrayList<?>))
-            return result;
+//        if (!(data instanceof PageResult<?>) && !(data instanceof ArrayList<?>))
+//            return result;
         List<JSONObject> items = new ArrayList<>();
 
         //step.1 筛选出加了 Dict 注解的字段列表
@@ -92,6 +92,7 @@ public class DictAspect {
         //取出结果集
         List records = new ArrayList();
         String instanceType = "";
+        boolean singleDataFlag = false;
         if(data instanceof PageResult<?>){
             records = ((PageResult) data).getList();
             instanceType = "PageResult";
@@ -99,6 +100,9 @@ public class DictAspect {
         else if(data instanceof ArrayList<?>){
             records = (List) data;
             instanceType = "ArrayList";
+        }else{
+            records.add( data);
+            singleDataFlag = true;
         }
 
         Boolean hasDict= checkHasDict(records);
@@ -193,6 +197,9 @@ public class DictAspect {
             ((ArrayList) data).clear();
             ((ArrayList) data).addAll(items);
         }
+        if(singleDataFlag){
+            ((CommonResult<JSONObject>) result).setData( items.get(0));
+        }
         return result;
     }