fix: 用户info加工位信息

workplace
chenhc 10 months ago
parent 218c101a40
commit 8e4ea95e41

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

@ -1,5 +1,7 @@
package com.glxp.api.res.auth; package com.glxp.api.res.auth;
import com.glxp.api.res.basic.UserWorkResponse;
import com.glxp.api.res.basic.WorkBindWorkResponse;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -29,4 +31,6 @@ public class LoginUserInfoResponse {
private String CustomerId; private String CustomerId;
private String companyName; private String companyName;
List<UserWorkResponse> workPlaces; //工位
} }

@ -49,4 +49,10 @@ public class BasicCollectUserService extends ServiceImpl<BasicCollectUserMapper,
} }
return true; return true;
} }
public List<UserWorkResponse> getUserWorkPlaceList(Long id) {
BasicCollectUserRequest request = new BasicCollectUserRequest();
request.setUserId(String.valueOf(id));
return basicCollectUserMapper.filterList(request);
}
} }

Loading…
Cancel
Save