|
|
|
@ -2,6 +2,9 @@ package com.glxp.api.controller.auth;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUnit;
|
|
|
|
|
import cn.hutool.crypto.SecureUtil;
|
|
|
|
|
import com.glxp.api.res.basic.UserWorkResponse;
|
|
|
|
|
import com.glxp.api.res.basic.WorkBindWorkResponse;
|
|
|
|
|
import com.glxp.api.service.basic.BasicCollectUserService;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.glxp.api.annotation.AuthRuleAnnotation;
|
|
|
|
@ -62,6 +65,8 @@ public class LoginController extends BaseController {
|
|
|
|
|
private CompanyService companyService;
|
|
|
|
|
@Resource
|
|
|
|
|
private AuthLicenseDao authLicenseDao;
|
|
|
|
|
@Resource
|
|
|
|
|
BasicCollectUserService basicCollectUserService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -341,8 +346,12 @@ public class LoginController extends BaseController {
|
|
|
|
|
// 权限集合
|
|
|
|
|
Set<String> permissions = sysPermissionService.getMenuPermission(authAdmin);
|
|
|
|
|
|
|
|
|
|
//工位集合
|
|
|
|
|
List<UserWorkResponse> workPlaces = basicCollectUserService.getUserWorkPlaceList(id);
|
|
|
|
|
|
|
|
|
|
loginUserInfoResponse.setRoles(roles);
|
|
|
|
|
loginUserInfoResponse.setPermissions(permissions);
|
|
|
|
|
loginUserInfoResponse.setWorkPlaces(workPlaces);
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success(loginUserInfoResponse);
|
|
|
|
|
}
|
|
|
|
|