服务订单接口-列表条件筛选

src/main/java/com/mmc/oms/service/mall/impl/ServiceOrderTaskServiceImpl.java

@@ -114,7 +114,8 @@ public class ServiceOrderTaskServiceImpl
 
     Map<Integer, List<ServiceOrderTaskImageDO>> imageMap = getImageListMapById(orderTaskIds);
 
-    Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, orderTaskIds);
+    List<Integer> userIds = orderTaskList.stream().map(ServiceOrderTaskDO::getUserAccountId).collect(Collectors.toList());
+    Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, userIds);
 
     List<ServiceOrderTaskDTO> pageList = new ArrayList<>();
     for (ServiceOrderTaskDO item : orderTaskList) {
@@ -132,13 +133,13 @@ public class ServiceOrderTaskServiceImpl
     }
     Map<Integer, ServiceOrderProvinceCityDO> provinceCityMap = getOrderProvinceCityDOMapById(Arrays.asList(id));
     Map<Integer, List<ServiceOrderTaskImageDO>> imageMap = getImageListMapById(Arrays.asList(id));
-    Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, Arrays.asList(id));
+    Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, Arrays.asList(order.getUserAccountId()));
     ServiceOrderTaskDTO serviceOrderTaskDTO = getServiceOrderTaskDTO(provinceCityMap, imageMap, order,userMap);
     return ResultBody.success(serviceOrderTaskDTO);
   }
 
-  private Map<Integer, UserAccountSimpleDTO> getUserDTOMap(HttpServletRequest request, List<Integer> orderTaskIds) {
-    List<UserAccountSimpleDTO> userList = userClient.feignListRcdUserInfo(orderTaskIds, request.getHeader(TokenConstant.TOKEN));
+  private Map<Integer, UserAccountSimpleDTO> getUserDTOMap(HttpServletRequest request, List<Integer> userIds) {
+    List<UserAccountSimpleDTO> userList = userClient.feignListUserAccountByIds(userIds, request.getHeader(TokenConstant.TOKEN));
     Map<Integer, UserAccountSimpleDTO> userMap = new HashMap<>();
     if(CollectionUtils.isNotEmpty(userList)){
       userMap = userList.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, d -> d, (k1, k2) -> k1));
@@ -153,7 +154,7 @@ public class ServiceOrderTaskServiceImpl
     // 用户信息
     UserAccountSimpleDTO userAccountSimpleDTO = userMap.get(item.getUserAccountId());
     BeanCopyUtils.properties(userAccountSimpleDTO, orderTaskDTO);
-    orderTaskDTO.setUserId(userAccountSimpleDTO.getId());
+    orderTaskDTO.setUserId(userAccountSimpleDTO==null?null:userAccountSimpleDTO.getId());
     List<ServiceOrderTaskImageDO> imageDOList = imageMap.get(item.getId());
     List<String> images = null;
     if (CollectionUtils.isNotEmpty(imageDOList)) {