diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml index 93a4ae3..f887e07 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml @@ -6,8 +6,9 @@ SELECT a.*, b.title as parentName, b.position as parentPosition, c.name as modelName FROM cms_navigation a - LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id - LEFT JOIN cms_model c ON a.model = c.model AND c.model = 0 + LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id AND b.deleted = 0 AND b.tenant_id = a.tenant_id + + LEFT JOIN cms_model c ON a.model = c.model AND c.deleted = 0 AND c.tenant_id = a.tenant_id AND a.navigation_id = #{param.navigationId}