修改用户查询
This commit is contained in:
@@ -381,7 +381,7 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
|
||||
throw new BusinessException(AlgorithmResponseEnum.DATA_ARRAY_MISSING);
|
||||
}
|
||||
List<String> collect = list.stream().map(CsDeviceUserPO::getSubUserId).distinct().collect(Collectors.toList());
|
||||
List<User> data = userFeignClient.getUserByIdList(collect).getData();
|
||||
List<User> data = userFeignClient.appuserByIdList(collect).getData();
|
||||
String primaryUserId = list.get(0).getPrimaryUserId();
|
||||
List<User> subUser = data.stream().filter(temp -> !Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
|
||||
List<User> primaryUser = data.stream().filter(temp -> Objects.equals(temp.getId(), primaryUserId)).collect(Collectors.toList());
|
||||
|
||||
@@ -57,7 +57,7 @@ public class CsEquipmentProcessPOServiceImpl extends ServiceImpl<CsEquipmentProc
|
||||
List<String> collect1 = result.getRecords().stream().map(CsEquipmentProcessDTO::getOperator).distinct().collect(Collectors.toList());
|
||||
Map<String, String> collect2;
|
||||
if(!CollectionUtils.isEmpty(collect1)){
|
||||
List<User> userTem = userFeignClient.getUserByIdList(collect1).getData();
|
||||
List<User> userTem = userFeignClient.appuserByIdList(collect1).getData();
|
||||
collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2));
|
||||
|
||||
} else {
|
||||
|
||||
@@ -45,7 +45,7 @@ public class CsEventSendMsgServiceImpl extends ServiceImpl<CsEventSendMsgMapper,
|
||||
List<String> collect1 = result.getRecords().stream().map(CsEventSendMsgVO::getUserId).distinct().collect(Collectors.toList());
|
||||
Map<String, String> collect2;
|
||||
if(!CollectionUtils.isEmpty(collect1)){
|
||||
List<User> userTem = userFeignClient.getUserByIdList(collect1).getData();
|
||||
List<User> userTem = userFeignClient.appuserByIdList(collect1).getData();
|
||||
collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2));
|
||||
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user