|
@@ -128,12 +128,12 @@ public class UserServiceImpl implements UserService{
|
|
List<UserInfoRespDTO> result = userApi.getUserInfo(list).getCheckedData();
|
|
List<UserInfoRespDTO> result = userApi.getUserInfo(list).getCheckedData();
|
|
List<ImUserInfoVo> resultVo = new ArrayList<>(result.size()+1);
|
|
List<ImUserInfoVo> resultVo = new ArrayList<>(result.size()+1);
|
|
Map<String, UserInfoRespDTO> collect = result.stream().collect(Collectors.toMap(item -> item.getUserId().toString() +"-"+ (null == item.getEnterpriseId() ? DEFAULT_ENTERPRISE_ID.intValue() : item.getEnterpriseId()), item -> item));
|
|
Map<String, UserInfoRespDTO> collect = result.stream().collect(Collectors.toMap(item -> item.getUserId().toString() +"-"+ (null == item.getEnterpriseId() ? DEFAULT_ENTERPRISE_ID.intValue() : item.getEnterpriseId()), item -> item));
|
|
- System.out.println(JSON.toJSONString(collect));
|
|
|
|
|
|
+// System.out.println(JSON.toJSONString(collect));
|
|
for (UserDO userDO : userDOS) {
|
|
for (UserDO userDO : userDOS) {
|
|
Long userId = userDO.getUserId();
|
|
Long userId = userDO.getUserId();
|
|
Long enterpriseId = userDO.getEnterpriseId();
|
|
Long enterpriseId = userDO.getEnterpriseId();
|
|
String key = userId+"-"+enterpriseId;
|
|
String key = userId+"-"+enterpriseId;
|
|
- System.out.println(key);
|
|
|
|
|
|
+// System.out.println(key);
|
|
ImUserInfoVo item =new ImUserInfoVo();
|
|
ImUserInfoVo item =new ImUserInfoVo();
|
|
item.setUserInfoResp(collect.get(key));
|
|
item.setUserInfoResp(collect.get(key));
|
|
item.setUserId(userId);
|
|
item.setUserId(userId);
|