From 4afe59c57d73bcc443f963921eb9a5cf757713de Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 15 一月 2025 10:18:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 807dc76..2259d4d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -418,6 +418,30 @@ } /** + * 门店登录使用 + * @param username + * @return + */ + @InnerAuth + @GetMapping("/infoShop/{username}") + public R<LoginUser> infoShop(@PathVariable("username") String username) { + SysUser sysUser = userService.selectUserByUserName(username); + if (StringUtils.isNull(sysUser)) { + return R.fail("用户名或密码错误"); + } + // 角色集合 + Set<String> roles = permissionService.getRolePermission(sysUser); + // 权限集合getRolePermission + Set<String> permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + + return R.ok(sysUserVo); + } + + /** * 注册用户信息 */ @PostMapping("/register") -- Gitblit v1.7.1