suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250710_userRegion' into 'master'

Browse Source 
fix

See merge request hangzhou/java/custom_zxjp!134
This commit is contained in:
苏竹红
2025-07-17 12:18:01 +00:00
parent a9bd237c24 72d14ae9c6
commit d4196235f8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
View File

@@ -1219,7 +1219,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
continue; continue;
} }
for(RegionDO regionDO:regions){ 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()); shopInfoDO.setManagerRegionId(regionDO.getId());
break; break;
} }