From 08a973bd45928772fb0e5e5d5b3984907c94c9b6 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Thu, 17 Apr 2025 20:40:43 +0800
Subject: [PATCH] fix

---
 .../main/java/com/cool/store/request/OrderSysInfoRequest.java  | 3 +--
 .../com/cool/store/service/impl/OperationLogServiceImpl.java   | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
index 9d2f94bd0..e29e6b137 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
@@ -117,8 +117,7 @@ public class OrderSysInfoRequest {
     }
     public Boolean check(){
         if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
-            //todo
-            if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse)){
+            if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){
                 return false;
             }
         }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
index 06a1a1456..004561049 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
@@ -90,6 +90,9 @@ public class OperationLogServiceImpl implements OperationLogService {
     public List<AuditInfoResponse> getAuditInfo(Long shopId, List<Integer> shopSubStageList) {
         List<AuditInfoResponse> responses = new ArrayList<>();
         List<OperationLogDO> logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null);
+        if (CollectionUtils.isEmpty(logList)) {
+            return responses;
+        }
         Map<Date, List<OperationLogDO>> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime));
        //根据时间分组
         for (Date date : operationLogMap.keySet()) {