diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
index 3daeb241f..d97c48f05 100644
--- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
@@ -84,4 +84,4 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha
 
         }
     }
-}
+}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
index 369ce2f29..880fde85d 100644
--- a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
@@ -86,20 +86,23 @@ public class AfterSaleSearchParams extends PageVO {
         if (CharSequenceUtil.isNotEmpty(orderSn)) {
             queryWrapper.like("order_sn", orderSn);
         }
-        //按买家查询
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) {
-            queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
-        }
-        //按卖家查询
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) {
-            queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
+        if(UserContext.getCurrentUser() != null){
+            //按买家查询
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) {
+                queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
+            }
+            //按卖家查询
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) {
+                queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
+            }
+
+            if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
+                    && CharSequenceUtil.isNotEmpty(storeId)
+            ) {
+                queryWrapper.eq("store_id", storeId);
+            }
         }
 
-        if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
-                && CharSequenceUtil.isNotEmpty(storeId)
-        ) {
-            queryWrapper.eq("store_id", storeId);
-        }
         if (CharSequenceUtil.isNotEmpty(memberName)) {
             queryWrapper.like("member_name", memberName);
         }