liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

合并app登录权限分支

Browse Source
This commit is contained in:
chenyouting
2025-07-01 14:12:41 +08:00
parent e0bc282097
commit 103579421c
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fys-admin/pom.xml
View File

@ -66,7 +66,7 @@
</dependency>
<!-- 设备管理模块 -->
<dependency>
<dependency>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-equipment</artifactId>
</dependency>
@ -105,6 +105,7 @@
<artifactId>fys-app</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>

4
fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
View File

@ -54,7 +54,7 @@ public class AppLoginService {
private Integer lockTime;
private final ISysTenantService tenantService;
private final IAppRoleService roleService;
private final IAppRoleService appRoleService;
/**
@ -119,7 +119,7 @@ public class AppLoginService {
Set<String> perms = new HashSet<>();
loginUser.setMenuPermission(perms);
loginUser.setRolePermission(perms);
List<AppRoleVo> roles = roleService.selectRolesByUserId(userId);
List<AppRoleVo> roles = appRoleService.selectRolesByUserId(userId);
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser;
}

11
pom.xml
View File

@ -355,7 +355,16 @@
<artifactId>fys-generator</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-app</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-equipment</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-demo</artifactId>