diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 0c173906c..4b0a7715e 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -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 permissions = sysPermissionService.getMenuPermission(authAdmin); + //工位集合 + List workPlaces = basicCollectUserService.getUserWorkPlaceList(id); + loginUserInfoResponse.setRoles(roles); loginUserInfoResponse.setPermissions(permissions); + loginUserInfoResponse.setWorkPlaces(workPlaces); return ResultVOUtils.success(loginUserInfoResponse); } diff --git a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java index 787a368dd..ec3dd912e 100644 --- a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.auth; +import com.glxp.api.res.basic.UserWorkResponse; +import com.glxp.api.res.basic.WorkBindWorkResponse; import lombok.Data; import java.util.List; @@ -29,4 +31,6 @@ public class LoginUserInfoResponse { private String CustomerId; private String companyName; + + List workPlaces; //工位 } diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java index 7fabce6ff..2f1bff410 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java @@ -49,4 +49,10 @@ public class BasicCollectUserService extends ServiceImpl getUserWorkPlaceList(Long id) { + BasicCollectUserRequest request = new BasicCollectUserRequest(); + request.setUserId(String.valueOf(id)); + return basicCollectUserMapper.filterList(request); + } }