|
@@ -1,6 +1,7 @@
|
|
|
package com.citu.module.menduner.im.service;
|
|
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.citu.framework.common.exception.enums.GlobalErrorCodeConstants;
|
|
|
import com.citu.framework.common.pojo.CommonResult;
|
|
@@ -126,7 +127,8 @@ public class UserServiceImpl implements UserService{
|
|
|
|
|
|
List<UserInfoRespDTO> result = userApi.getUserInfo(list).getCheckedData();
|
|
|
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 : 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));
|
|
|
for (UserDO userDO : userDOS) {
|
|
|
Long userId = userDO.getUserId();
|
|
|
Long enterpriseId = userDO.getEnterpriseId();
|