bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
tqzhang 2025-03-05 14:30:39 +08:00
parent 7683cd39c7 e2795eb385
commit 7f6b8e3255
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/api/MgrAuthApi.java
View File

@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Optional;
@Service @Service
public class MgrAuthApi { public class MgrAuthApi {
@ -71,6 +72,10 @@ public class MgrAuthApi {
user.setUserid(SecurityUtils.getUserId()); user.setUserid(SecurityUtils.getUserId());
user.setUsername(SecurityUtils.getUsername()); user.setUsername(SecurityUtils.getUsername());
String roleCode = (String) SecureManager.getSubjectData().get("roleCode"); String roleCode = (String) SecureManager.getSubjectData().get("roleCode");
Optional<String> firstElement = user.getRoles().stream().findFirst();
if (firstElement.isPresent()) {
roleCode = firstElement.get();
}
if (ObjectUtil.isEmpty(roleCode)) { if (ObjectUtil.isEmpty(roleCode)) {
throw new ServiceException(I18n.getMessage("auth_user_no_role_code", new Object[0])); throw new ServiceException(I18n.getMessage("auth_user_no_role_code", new Object[0]));
} else { } else {