|
@@ -179,16 +179,18 @@ public class UserService implements IUserService {
|
|
|
maintenanceCompanyService.setCompanyUserNum(maintenanceCompanyList);
|
|
|
userResponse.setCompanyList(maintenanceCompanyList);
|
|
|
//用户进入后的默认团队信息
|
|
|
- MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
|
|
|
- userResponse.setMaintenanceCompany(maintenanceCompany);
|
|
|
- //获取用户在默认团队中的角色信息
|
|
|
- Role role = roleService.getRoleByUserIdAndCompanyId(userId, maintenanceCompany.getId());
|
|
|
- userResponse.setRole(role);
|
|
|
- //获取用户在当前企业下的菜单
|
|
|
- if (role != null) {
|
|
|
- List<Menu> menus = menuService.getByRoleId(role.getId());
|
|
|
- menus = menuService.getMenuTree(menus);
|
|
|
- userResponse.setMenus(menus);
|
|
|
+ if(maintenanceCompanyList != null && maintenanceCompanyList.size() > 0){
|
|
|
+ MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
|
|
|
+ userResponse.setMaintenanceCompany(maintenanceCompany);
|
|
|
+ //获取用户在默认团队中的角色信息
|
|
|
+ Role role = roleService.getRoleByUserIdAndCompanyId(userId, maintenanceCompany.getId());
|
|
|
+ userResponse.setRole(role);
|
|
|
+ //获取用户在当前企业下的菜单
|
|
|
+ if (role != null) {
|
|
|
+ List<Menu> menus = menuService.getByRoleId(role.getId());
|
|
|
+ menus = menuService.getMenuTree(menus);
|
|
|
+ userResponse.setMenus(menus);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return userResponse;
|