为减少查询次数，关联子账号 在我的页面单独查询

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -162,7 +162,7 @@ public class SysUserController extends BaseController {
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(sysUser);
         // 获取机构数据
-        SysOrg sysOrg = orgMapper.selectById(sysUser.getOrgId());
+        SysOrg sysOrg = sysOrgService.selectSysOrgById(sysUser.getOrgId());
 
         LoginUser sysUserVo = new LoginUser();
         sysUserVo.setSysOrg(sysOrg);
@@ -222,19 +222,31 @@ public class SysUserController extends BaseController {
         ajax.put("permissions", permissions);
 
         // 获取当前登录账号是否存在 关联子账号
-        List<SysMasterSubUserVO> subUser = new ArrayList<>();
-        if (ObjectUtil.isNotEmpty(SecurityUtils.getMasterUserId())) {
-            subUser = userService.selectSwitchUserList(SecurityUtils.getMasterUserId(), user.getId());
-        } else {
-            subUser = userService.selectSwitchUserList(user.getId(), null);
-        }
-
-        ajax.put("subUserList", subUser);
+        // 为减少查询次数，改为在使用页面实时查询
+//        List<SysMasterSubUserVO> subUser = new ArrayList<>();
+//        if (ObjectUtil.isNotEmpty(SecurityUtils.getMasterUserId())) {
+//            subUser = userService.selectSwitchUserList(SecurityUtils.getMasterUserId(), user.getId());
+//        } else {
+//            subUser = userService.selectSwitchUserList(user.getId(), null);
+//        }
+//
+//        ajax.put("subUserList", subUser);
         ajax.put("masterUserId", SecurityUtils.getMasterUserId());
         ajax.put("masterUserName", SecurityUtils.getMasterUsername());
         return ajax;
     }
 
+    @Log(title = "关联子用户", businessType = BusinessType.OTHER)
+    @GetMapping("/subuser")
+    public R<List<SysMasterSubUserVO>> getSubUser() {
+        List<SysMasterSubUserVO> subUser = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(SecurityUtils.getMasterUserId())) {
+            subUser = userService.selectSwitchUserList(SecurityUtils.getMasterUserId(), SecurityUtils.getUserId());
+        } else {
+            subUser = userService.selectSwitchUserList(SecurityUtils.getUserId(), null);
+        }
+        return R.ok(subUser);
+    }
 
     /**
      * 用户关联子用户