fix: 分切业务区域校验

This commit is contained in:
2024-03-06 18:11:40 +08:00
parent 4103b9c21e
commit 238b406aa3
31 changed files with 299 additions and 141 deletions

View File

@@ -93,21 +93,21 @@
</select>
<select id="queryPdaAuthority" resultType="com.alibaba.fastjson.JSONObject">
SELECT
max( sys_user.user_id )as accountId,
max( sys_user.username ) as username,
max( sys_roles_menus.menu_id ) as menu_id,
max( sys_menu.component ) as component,
max( sys_menu.path ) as path,
max( sys_menu.`name` ) as name
max( sys_user.user_id ) AS accountId,
max( sys_user.username ) AS username,
max( sys_roles_menus.menu_id ) AS menu_id,
max( sys_menu.component ) AS component,
max( sys_menu.path ) AS path,
max( sys_menu.component_name ) AS component_name
FROM
sys_user AS sys_user
LEFT JOIN sys_users_roles AS sys_users_roles ON sys_users_roles.user_id = sys_user.user_id
LEFT JOIN sys_role AS sys_role ON sys_role.role_id = sys_users_roles.role_id
LEFT JOIN sys_roles_menus AS sys_roles_menus ON sys_roles_menus.role_id = sys_role.role_id
LEFT JOIN sys_menu AS sys_menu ON sys_menu.menu_id = sys_roles_menus.menu_id
sys_user sys_user
LEFT JOIN sys_users_roles sys_users_roles ON sys_users_roles.user_id = sys_user.user_id
LEFT JOIN sys_role sys_role ON sys_role.role_id = sys_users_roles.role_id
LEFT JOIN sys_roles_menus sys_roles_menus ON sys_roles_menus.role_id = sys_role.role_id
LEFT JOIN sys_menu sys_menu ON sys_menu.menu_id = sys_roles_menus.menu_id
WHERE
sys_menu.path LIKE 'RF%'
and sys_menu.is_pc='0'
sys_menu.component_name LIKE 'RF%'
and sys_menu.is_pc = '0'
AND sys_menu.hidden = 0
<if test="accountId != null">
AND sys_user.user_id = #{accountId}
@@ -123,7 +123,7 @@
sys_menu.title,
sys_menu.component,
sys_menu.path,
sys_menu.NAME,
sys_menu.component_name,
sys_menu.menu_sort
ORDER BY sys_menu.menu_sort
</select>

View File

@@ -463,7 +463,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
@Override
public Map<String, Object> queryAuthority(Map<String, String> param) {
String accountId = SecurityUtils.getCurrentUserId();
String accountId = "1";
JSONObject returnjo = new JSONObject();
if (StrUtil.isEmpty(accountId)) {
returnjo.put("code", "0");
@@ -480,7 +480,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
for (int i = 0; i < SecondResults.size(); i++) {
JSONObject row = SecondResults.getJSONObject(i);
String menu_id = row.getString("menu_id");
JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "1", menu_id);
JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "2", menu_id);
row.put("sonTree", ThirdResults);
roleTree.add(row);
}