字典查询修改当前组织没数据查询上级组织

2026-06-17 16:33:43 +08:00
parent ff523fc54a
commit 1667a86a19
1 changed files with 22 additions and 2 deletions
@@ -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);
    }
    /**