From 011d60a4d7bba422eba269cf819b07c53d6c5e0c Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Wed, 28 May 2025 10:26:19 +0800
Subject: [PATCH] fix

---
 .../store/dao/ShopStageRemarkInfoDAO.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
index ca80061a3..b92e8cec4 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -32,7 +33,7 @@ public class ShopStageRemarkInfoDAO {
     }
     public ShopStageRemarkInfoDO getByShopIdAndStage(Long shopId, Integer shopSubStageStatus) {
        if (Objects.isNull(shopId) || Objects.isNull(shopSubStageStatus)){
-           return null;
+           return new ShopStageRemarkInfoDO();
        }
         Example example = new Example(ShopStageRemarkInfoDO.class);
          example.createCriteria().andEqualTo("shopId", shopId).andEqualTo("shopSubStageStatus", shopSubStageStatus);
@@ -44,7 +45,7 @@ public class ShopStageRemarkInfoDAO {
     }
     public ShopStageRemarkInfoDO getByLineIdAndStage(Long lineId, Integer workflowSubStageStatus) {
         if (Objects.isNull(lineId) || Objects.isNull(workflowSubStageStatus)){
-            return null;
+            return new ShopStageRemarkInfoDO();
         }
         Example example = new Example(ShopStageRemarkInfoDO.class);
         example.createCriteria().andEqualTo("lineId", lineId).andEqualTo("workflowSubStageStatus", workflowSubStageStatus);
@@ -57,19 +58,27 @@ public class ShopStageRemarkInfoDAO {
 
     public List<ShopStageRemarkInfoDO> getByShopIdsAndStage(List<Long> shopIds, List<Integer> shopSubStageStatusList) {
         if (CollectionUtils.isEmpty(shopIds) || CollectionUtils.isEmpty(shopSubStageStatusList)){
-            return null;
+            return new ArrayList<>();
         }
         Example example = new Example(ShopStageRemarkInfoDO.class);
         example.createCriteria().andIn("shopId", shopIds).andIn("shopSubStageStatus", shopSubStageStatusList);
-        return shopStageRemarkInfoMapper.selectByExample(example);
+        List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result ;
     }
 
     public List<ShopStageRemarkInfoDO> getByLineIdsAndStage(List<Long> lineIds, List<Integer> workflowSubStageStatusList) {
         if (CollectionUtils.isEmpty(lineIds) || CollectionUtils.isEmpty(workflowSubStageStatusList)){
-            return null;
+            return new ArrayList<>();
         }
         Example example = new Example(ShopStageRemarkInfoDO.class);
         example.createCriteria().andIn("lineId", lineIds).andIn("workflowSubStageStatus", workflowSubStageStatusList);
-        return shopStageRemarkInfoMapper.selectByExample(example);
+        List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result ;
     }
 }