|
|
|
@ -35,6 +35,9 @@ import org.energy.modules.system.mapper.UserMapper; |
|
|
|
|
import org.energy.modules.system.service.*; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
import org.energy.modules.system.service.IMenuService; |
|
|
|
|
import org.energy.modules.system.vo.MenuVO; |
|
|
|
|
import com.dayu.daf.core.secure.DafUser; |
|
|
|
|
|
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.List; |
|
|
|
@ -56,6 +59,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement |
|
|
|
|
private IRoleService roleService; |
|
|
|
|
private IUserOauthService userOauthService; |
|
|
|
|
private ITenantService tenantService; |
|
|
|
|
private IMenuService menuService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public boolean submit(User user) { |
|
|
|
@ -95,6 +99,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement |
|
|
|
|
List<String> roleAlias = baseMapper.getRoleAlias(Func.toLongList(user.getRoleId())); |
|
|
|
|
userInfo.setRoles(roleAlias); |
|
|
|
|
} |
|
|
|
|
List<MenuVO> list = menuService.routes(userInfo.getUser().getRoleId()); |
|
|
|
|
userInfo.setRoleMenus(list); |
|
|
|
|
return userInfo; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -232,6 +238,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement |
|
|
|
|
List<String> roleAlias = baseMapper.getRoleAlias(Func.toLongList(user.getRoleId())); |
|
|
|
|
userInfo.setRoles(roleAlias); |
|
|
|
|
} |
|
|
|
|
List<MenuVO> list = menuService.routes(userInfo.getUser().getRoleId()); |
|
|
|
|
userInfo.setRoleMenus(list); |
|
|
|
|
return userInfo; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|