diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index d59347601..788b7f532 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -141,7 +141,36 @@ ) and p.del_flag = 0 - + UNION + SELECT p.id, + p.parent_id, + p.name, + p.url, + p.component, + p.is_route, + p.component_name, + p.redirect, + p.menu_type, + p.perms, + p.perms_type, + p.sort_no, + p.always_show, + p.icon, + p.is_leaf, + p.keep_alive, + p.hidden, + p.hide_tab, + p.rule_flag, + p.status, + p.internal_or_external + FROM sys_permission p + WHERE p.id IN ( + SELECT DISTINCT a.permission_id + FROM sys_depart_permission a + INNER JOIN sys_user_depart d ON a.depart_id = d.dep_id + INNER JOIN sys_user u ON d.user_id = u.id AND u.id = #{userId,jdbcType=VARCHAR} + ) + AND p.del_flag = 0 ) h order by h.sort_no ASC @@ -223,4 +252,4 @@ and p.del_flag = 0 - \ No newline at end of file +