数据处理
This commit is contained in:
@@ -1205,11 +1205,15 @@ public class DataHandlerServerImpl implements DataHandlerServer {
|
||||
errorList.add(errorDTO);
|
||||
continue;
|
||||
}
|
||||
if (bigRegionDTO.getStoreManageRegionId()==null){
|
||||
if (bigRegionDTO.getStoreManageRegionId()!=null){
|
||||
regionDO = manageRegionMap.get(name);
|
||||
}else{
|
||||
regionDO= branchStoreManageMap.get(name);
|
||||
}
|
||||
if (shopInfoDO.getId()==313){
|
||||
log.info("bigRegionDTO:{}",JSONObject.toJSONString(bigRegionDTO));
|
||||
log.info("regionDO:{}",JSONObject.toJSONString(regionDO));
|
||||
}
|
||||
if (Objects.isNull(regionDO)){
|
||||
log.info("门店所属管理区域未找到 shopId:{}",shopInfoDO.getId());
|
||||
ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(shopInfoDO.getShopCode(), "门店所属管理区域未找到");
|
||||
|
||||
@@ -172,6 +172,8 @@ public class RegionServiceImpl implements RegionService {
|
||||
BigRegionDO byRegionId = bigRegionDAO.getByRegionId(regionId);
|
||||
if (byRegionId.getStoreManageRegionId()==null){
|
||||
regionId=byRegionId.getRegionId();
|
||||
}else {
|
||||
regionId=byRegionId.getStoreManageRegionId();
|
||||
}
|
||||
return regionMapper.getSubRegionByParentIdAndRegionType(regionId,"path");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user