no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -191,10 +191,10 @@ public class OrderBaseEsLogic {
             operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
         }
 
-        Map<String, String> operatorMap = null;
+        Map<String, List<OperatorLogBean>> operatorMap = null;
         if (CollectionUtil.isNotEmpty(operatorList)) {
             operatorMap = operatorList.stream()
-                    .collect(Collectors.toMap(OperatorLogBean::getOrderBaseId, OperatorLogBean::getContent));
+                    .collect(Collectors.groupingBy(OperatorLogBean::getOrderBaseId));
         }
 
         //服务单标识
@@ -220,7 +220,7 @@ public class OrderBaseEsLogic {
                 }
 
                 if (Objects.nonNull(operatorMap) && operatorMap.containsKey(orderBaseVO.getId())) {
-                    orderBaseVO.setLastFeedbackRecord(operatorMap.get(orderBaseVO.getId()));
+                    orderBaseVO.setLastFeedbackRecord(operatorMap.get(orderBaseVO.getId()).get(0).getContent());
                 }
             }
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -197,10 +197,10 @@ public class OrderBaseLogic {
 
             List<OperatorLogBean> operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
 
-            Map<String, String> operatorMap = null;
+            Map<String, List<OperatorLogBean>> operatorMap = null;
             if (CollectionUtil.isNotEmpty(operatorList)) {
                 operatorMap = operatorList.stream()
-                        .collect(Collectors.toMap(OperatorLogBean::getOrderBaseId, OperatorLogBean::getContent));
+                        .collect(Collectors.groupingBy(OperatorLogBean::getOrderBaseId));
             }
 
             for (OrderBaseVO orderBaseVO : page.getRecords()) {
@@ -214,7 +214,7 @@ public class OrderBaseLogic {
                 }
 
                 if (Objects.nonNull(operatorMap) && operatorMap.containsKey(orderBaseVO.getId())) {
-                    orderBaseVO.setLastFeedbackRecord(operatorMap.get(orderBaseVO.getId()));
+                    orderBaseVO.setLastFeedbackRecord(operatorMap.get(orderBaseVO.getId()).get(0).getContent());
                 }
 
             }