|
|
@@ -48,7 +48,6 @@ public class UserInfoManage { |
|
|
|
private final IUserRoleService iUserRoleService; |
|
|
|
private final IRoleService iRoleService; |
|
|
|
private final UserInfoHelper userInfoHelper; |
|
|
|
private final UserDetailsService userDetailsService; |
|
|
|
|
|
|
|
public PageVo<ResUserInfoListVO> list(ReqUserInfoListPO reqUserInfoListPO) { |
|
|
|
LambdaQueryWrapper<DingEmployeeInfo> wrapper = Wrappers.lambdaQuery(DingEmployeeInfo.class) |
|
|
@@ -250,6 +249,11 @@ public class UserInfoManage { |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
resUserDetailVO.setUserRoleInfoList(userRoleInfoList); |
|
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); |
|
|
|
if(Objects.nonNull(userFullInfo)){ |
|
|
|
resUserDetailVO.setOrgCode(userFullInfo.getOrganizationCode()); |
|
|
|
resUserDetailVO.setOrgName(userFullInfo.getOrganizationName()); |
|
|
|
} |
|
|
|
return resUserDetailVO; |
|
|
|
} |
|
|
|
|
|
|
|