From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge

---
 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
index 69d5127..d7595f8 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
@@ -145,10 +145,12 @@
     public R<UserInfoDTO> user()
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
+        Set<String> roles = permissionService.getRolePermission(user);
         SysDepartment byId2 = departmentService.getById(user.getDepartmentId());
         UserInfoDTO userInfoDTO = new UserInfoDTO();
         userInfoDTO.setNickName(user.getNickName());
         userInfoDTO.setDepartment(byId2);
+        userInfoDTO.setRoles(roles);
         return R.ok(userInfoDTO);
     }
 

--
Gitblit v1.7.1