From 2ce6327ec49e7fe73cc1cd3bcc2b63b28d89d38f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:05:25 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 99f0a4d..6116334 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -38,8 +38,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -129,6 +129,8 @@
private WarehouseRoleMenuService warehouseRoleMenuService;
@Autowired
private BasContainerService basContainerService;
+ @Resource
+ private UserRoleService userRoleService;
/**
* @return
@@ -157,6 +159,14 @@
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
return R.parse(CodeRes.USER_10003);
}
+
+ List<Role> roles = userRoleService.listByUserId(user.getId());
+ user.setRoles(roles);
+ Long[] roleIds = new Long[roles.size()];
+ for(int i = 0; i < roles.size(); i++) {
+ roleIds[i] = roles.get(i).getId();
+ }
+ user.setRoleIds(roleIds);
String accessToken = JwtUtil.buildToken(new JwtSubject(param.getUsername(), user.getTenantId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
@@ -1026,7 +1036,7 @@
.map(WarehouseRoleMenu::getMenuId)
.collect(Collectors.toSet());
// 鑾峰彇 areaList 骞惰浆鎹负 Long 绫诲瀷鐨� Set
- List<Integer> areaList = container.getAreas();
+ List<Integer> areaList = container.getAreasIds();
Set<Long> areaSet = new HashSet<>();
if (areaList != null) {
areaList.forEach(area -> areaSet.add(area.longValue()));
@@ -1066,7 +1076,7 @@
.map(WarehouseRoleMenu::getMenuId)
.collect(Collectors.toSet());
// 鑾峰彇 areaList 骞惰浆鎹负 Long 绫诲瀷鐨� Set
- List<Integer> areaList = container.getAreas();
+ List<Integer> areaList = container.getAreasIds();
Set<Long> areaSet = new HashSet<>();
if (areaList != null) {
areaList.forEach(area -> areaSet.add(area.longValue()));
@@ -1279,3 +1289,4 @@
}
}
+
--
Gitblit v1.9.1