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);
     }
     /**