FengChaoYu преди 1 седмица
родител
ревизия
f5d1976b2b
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

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

@@ -188,7 +188,9 @@ public class OrderBaseEsLogic {
         List<OperatorLogBean> operatorList = null;
         if (page.getSize() > 0) {
             final List<String> orderBaseIds = page.getRecords().stream().map(OrderBaseVO::getId).distinct().collect(Collectors.toList());
-            operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
+            if (CollectionUtil.isNotEmpty(orderBaseIds)) {
+                operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
+            }
         }
 
         Map<String, List<OperatorLogBean>> operatorMap = null;