From 1667a86a190771452d26a1de61df7045e0fe7dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 17 Jun 2026 16:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87=E6=B2=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=8A=E7=BA=A7=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDictDataController.java     | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysDictDataController.java b/mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysDictDataController.java
index 607baefc0..b398d347a 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysDictDataController.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysDictDataController.java
@@ -43,12 +43,32 @@ public class SysDictDataController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     {
-        if (!applyDictDataOrganizationFilterByDictType(dictData))
+        // 优先查当前组织的数据
+        if (applyDictDataOrganizationFilterByDictType(dictData))
         {
-            return getDataTable(new ArrayList<>());
+            startPage();
+            List<SysDictData> list = dictDataService.selectDictList(dictData);
+            if (!list.isEmpty())
+            {
+                return getDataTable(list);
+            }
         }
+
+        // 当前组织没数据，回退查 top_organization_id = 2827 的
+        dictData.setOrganizationId(null);
+        dictData.setTopOrganizationId(2827L);
         startPage();
         List<SysDictData> list = dictDataService.selectDictList(dictData);
+        if (!list.isEmpty())
+        {
+            return getDataTable(list);
+        }
+
+        // 还是没有，回退查 top_organization_id = 0 的（公共数据）
+        dictData.setOrganizationId(null);
+        dictData.setTopOrganizationId(0L);
+        startPage();
+        list = dictDataService.selectDictList(dictData);
         return getDataTable(list);
     }
     /**