|
@@ -12,6 +12,7 @@ import com.zhongzheng.framework.web.service.TopSysPermissionService;
|
|
|
import com.zhongzheng.framework.web.service.TopTokenService;
|
|
|
import com.zhongzheng.modules.top.user.domain.TopSysMenu;
|
|
|
import com.zhongzheng.modules.top.user.service.ITopSysMenuService;
|
|
|
+import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
|
|
|
import com.zhongzheng.modules.top.user.service.ITopSysUserService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -54,6 +55,9 @@ public class SuperSysLoginController
|
|
|
|
|
|
@Autowired
|
|
|
private ITopSysUserService userService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ITopSysRoleService iTopSysRoleService;
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|
|
@@ -89,10 +93,12 @@ public class SuperSysLoginController
|
|
|
Set<String> roles = permissionService.getRolePermission(user);
|
|
|
// 权限集合
|
|
|
Set<String> permissions = permissionService.getMenuPermission(user);
|
|
|
+ List<Integer> rolesId = iTopSysRoleService.selectRoleListByUserId(user.getUserId());
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
map.put("user", user);
|
|
|
map.put("roles", roles);
|
|
|
map.put("permissions", permissions);
|
|
|
+ map.put("rolesId", rolesId);
|
|
|
|
|
|
return AjaxResult.success(map);
|
|
|
|