|
@@ -6,9 +6,11 @@
|
|
package org.eco.vip.auth.service.auth;
|
|
package org.eco.vip.auth.service.auth;
|
|
|
|
|
|
|
|
|
|
|
|
+import jakarta.annotation.Resource;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.eco.vip.auth.domain.user.pojo.UserVO;
|
|
import org.eco.vip.auth.domain.user.pojo.UserVO;
|
|
|
|
+import org.eco.vip.auth.service.permission.IPermissionService;
|
|
import org.eco.vip.orm.pojo.LoginUser;
|
|
import org.eco.vip.orm.pojo.LoginUser;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -24,6 +26,9 @@ import org.springframework.stereotype.Service;
|
|
@Service
|
|
@Service
|
|
public class LoginService {
|
|
public class LoginService {
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private IPermissionService permissionService;
|
|
|
|
+
|
|
public LoginUser buildLoginUser(UserVO user) {
|
|
public LoginUser buildLoginUser(UserVO user) {
|
|
LoginUser loginUser = new LoginUser();
|
|
LoginUser loginUser = new LoginUser();
|
|
loginUser.setTenantId(user.getTenantId());
|
|
loginUser.setTenantId(user.getTenantId());
|
|
@@ -32,6 +37,7 @@ public class LoginService {
|
|
loginUser.setUserName(user.getUserName());
|
|
loginUser.setUserName(user.getUserName());
|
|
loginUser.setNickname(user.getNickName());
|
|
loginUser.setNickname(user.getNickName());
|
|
loginUser.setUserType(user.getUserType());
|
|
loginUser.setUserType(user.getUserType());
|
|
|
|
+ loginUser.setAccount(user.getAccount());
|
|
// loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
|
|
// loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
|
|
// loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
|
|
// loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
|
|
// loginUser.setOrgName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
|
|
// loginUser.setOrgName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
|