|
@@ -105,6 +105,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
|
|
|
);
|
|
|
//获取角色关联的用户信息
|
|
|
List<Long> userIdList = ProjectUtils.getAttrList(userRoleList, "userId", null);
|
|
|
+ Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, mtCompanyUserRequest.getCompanyId());
|
|
|
//获取用户信息集合
|
|
|
if (userIdList != null && userIdList.size() > 0) {
|
|
|
List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
|
|
@@ -115,6 +116,9 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
|
|
|
UserResponse userResponse = new UserResponse();
|
|
|
userResponse.setUserId(userId);
|
|
|
UserInfo userInfo = userIdToUserInfo.get(userId);
|
|
|
+ //用户id->角色
|
|
|
+ Role role = userIdToRole.get(userId);
|
|
|
+ userResponse.setRole(role);
|
|
|
if (userInfo != null) {
|
|
|
userResponse.setName(userInfo.getName());
|
|
|
}
|