|
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R;
|
|
|
import com.ruoyi.common.core.domain.entity.SysMenu;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.domain.model.LoginBody;
|
|
|
+import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
import com.ruoyi.common.core.domain.model.SmsLoginBody;
|
|
|
import com.ruoyi.common.helper.LoginHelper;
|
|
|
import com.ruoyi.system.domain.vo.RouterVo;
|
|
@@ -24,7 +25,6 @@ import javax.validation.constraints.NotBlank;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
|
|
|
/**
|
|
|
* 登录验证
|
|
@@ -107,15 +107,12 @@ public class SysLoginController {
|
|
|
*/
|
|
|
@GetMapping("getInfo")
|
|
|
public R<Map<String, Object>> getInfo() {
|
|
|
- SysUser user = userService.selectUserById(LoginHelper.getUserId());
|
|
|
- // 角色集合
|
|
|
- Set<String> roles = permissionService.getRolePermission(user);
|
|
|
- // 权限集合
|
|
|
- Set<String> permissions = permissionService.getMenuPermission(user);
|
|
|
+ LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
+ SysUser user = userService.selectUserById(loginUser.getUserId());
|
|
|
Map<String, Object> ajax = new HashMap<>();
|
|
|
ajax.put("user", user);
|
|
|
- ajax.put("roles", roles);
|
|
|
- ajax.put("permissions", permissions);
|
|
|
+ ajax.put("roles", loginUser.getRolePermission());
|
|
|
+ ajax.put("permissions", loginUser.getMenuPermission());
|
|
|
return R.ok(ajax);
|
|
|
}
|
|
|
|