From 72d14ae9c687e37ee616d13aae5973766f700ea1 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Thu, 17 Jul 2025 20:16:39 +0800
Subject: [PATCH] fix

---
 .../com/cool/store/service/impl/DataHandlerServerImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
index 13f4a8de0..650abffd2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
@@ -1219,7 +1219,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
                 continue;
             }
             for(RegionDO regionDO:regions){
-                if (Long.valueOf(regionDO.getParentId()).equals(bigRegionDTO.getStoreManageRegionId())){
+                if ((Long.valueOf(regionDO.getParentId()).equals(bigRegionDTO.getStoreManageRegionId())&&bigRegionDTO.getStoreManageRegionId()!=null)
+                        ||(Long.valueOf(regionDO.getParentId()).equals(bigRegionDTO.getRegionId())&&bigRegionDTO.getStoreManageRegionId()==null)){
                     shopInfoDO.setManagerRegionId(regionDO.getId());
                     break;
                 }