Commit c2a23327 by huangjinxin

fix:用户信息返回设置

1 parent a5df19af
...@@ -2,6 +2,7 @@ package com.dituhui.pea.pojo; ...@@ -2,6 +2,7 @@ package com.dituhui.pea.pojo;
import java.util.List; import java.util.List;
import com.dituhui.pea.pojo.user.UserMenuSettingInfo;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
...@@ -26,5 +27,6 @@ public class UserLoginDTO { ...@@ -26,5 +27,6 @@ public class UserLoginDTO {
private List<RoleInfo> roles; private List<RoleInfo> roles;
private List<ResourceInfo> menus; private List<ResourceInfo> menus;
private List<OrganizationDTO> auths; private List<OrganizationDTO> auths;
private List<UserMenuSettingInfo> settings;
} }
...@@ -216,6 +216,9 @@ public class UserService { ...@@ -216,6 +216,9 @@ public class UserService {
} }
} }
userDTO.setAuths(allOrgs); userDTO.setAuths(allOrgs);
// 获取用户配置
userDTO.setSettings(getSettings(userDTO.getId()));
return userDTO; return userDTO;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!