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 b398d347a..c3fee0e52 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 @@ -54,9 +54,9 @@ public class SysDictDataController extends BaseController } } - // 当前组织没数据,回退查 top_organization_id = 2827 的 - dictData.setOrganizationId(null); - dictData.setTopOrganizationId(2827L); + // 当前组织没数据,回退查 organization_id = 2827 的 + dictData.setOrganizationId(2827L); + dictData.setTopOrganizationId(null); startPage(); List list = dictDataService.selectDictList(dictData); if (!list.isEmpty()) @@ -64,9 +64,9 @@ public class SysDictDataController extends BaseController return getDataTable(list); } - // 还是没有,回退查 top_organization_id = 0 的(公共数据) - dictData.setOrganizationId(null); - dictData.setTopOrganizationId(0L); + // 还是没有,回退查 organization_id = 0 的(公共数据) + dictData.setOrganizationId(0L); + dictData.setTopOrganizationId(null); startPage(); list = dictDataService.selectDictList(dictData); return getDataTable(list);