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; }