diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java index c491646..7b361aa 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java @@ -13,7 +13,6 @@ import com.renkang.anyan.client.AnYanClient; import com.renkang.anyan.model.dto.EmergencyContactParam; import com.renkang.anyan.model.vo.EmergencyContactVO; import com.renkang.emergency.api.service.EmergencyApiService; -import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.bean.request.CallBack; import com.renkang.emergency.bean.request.EmergencyCall; import com.renkang.emergency.bean.request.EmergencySocket; @@ -24,6 +23,7 @@ import com.renkang.emergency.entity.*; import com.renkang.emergency.entity.dto.AddOtherMemberDTO; import com.renkang.emergency.entity.dto.RemoveGroupMemberDTO; import com.renkang.emergency.entity.vo.CreateGroupMagVO; +import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.manager.EmergencyCloudManager; import com.renkang.emergency.mapper.*; import com.renkang.emergency.service.IEmergencyCenterService; @@ -1379,7 +1379,8 @@ public class EmergencyApiServiceImpl implements EmergencyApiService { Result addGroupMemberVoResult = iMHelloApi.addGroupMember(addGroupMemberDTO); String actionStatus = addGroupMemberVoResult.getResult().getActionStatus(); if (!"OK".equals(actionStatus)) { - ExceptionAssertsUtil.fail(addGroupMemberVoResult.getResult().getErrorInfo()); + log.error("添加群成员失败, actionStatus: {}, errorInfo: {}", actionStatus, addGroupMemberVoResult.getResult().getErrorInfo()); + ExceptionAssertsUtil.fail("添加群成员失败"); } return true; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java index 9129660..80925c8 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java @@ -786,11 +786,11 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { profUsers.forEach(u -> profUserMap.put(u.getUserId(), u)); } - // 查询员工成员的系统用户信息 + // 查询员工成员的系统用户信息(所有profUserMap未命中的userId都走SysUser兜底) List employeeUserIds = orderOperators.stream() - .filter(op -> op.getOperatorType() != null && op.getOperatorType() == 2) .map(OrderOperator::getUserId) .filter(uid -> !profUserMap.containsKey(uid)) + .distinct() .collect(Collectors.toList()); Map sysUserMap = new HashMap<>(); if (!employeeUserIds.isEmpty()) { diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java index 3d5162e..0dbd011 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java @@ -46,7 +46,7 @@ public class EmergencyCloudManager { // TODO 微服务调用会发送post请求 暂时将 listUserByIds修改为post list = sysBaseAPI.listUserByIds(listUser); } catch (Exception e) { - logger.error("微服务调用失败(system listUserByIds)"); + logger.error("微服务调用失败(system listUserByIds)", e); } if (CollectionUtils.isEmpty(list)) { return map;