From c1f1896f06363316ae0257e8b6aed583a973253f Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 23 Aug 2024 09:26:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=85=A5=E9=94=80=E5=94=AE=E5=9C=B0=E7=90=86?= =?UTF-8?q?=E5=A4=A7=E5=8C=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 1e626f1e..31253baa 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -1331,19 +1331,37 @@ public class BmsSupplierController { if(StringUtils.hasText(a.getSalesRegionName())){ BmsRegion saleRegion = saleRegionMap.get(a.getSalesRegionName()); supplier.setRegionLast(saleRegion.getId()); - supplier.setRegionSecond(saleRegion.getId()); - supplier.setRegionFirst(saleRegion.getPid()); + String[] ids = saleRegion.getPathIds().split("_"); + supplier.setRegionFirst(ids[0]); + if(ids.length>1){ + supplier.setRegionSecond(ids[1]); + }else { + supplier.setRegionSecond("0"); + } + if(ids.length>2){ + supplier.setRegionThird(ids[2]); + }else { + supplier.setRegionThird("0"); + } } if(StringUtils.hasText(a.getSecondaryLevelAdministrativeRegionName()) && StringUtils.hasText(a.getFirstLevelAdministrativeRegionName()) && StringUtils.hasText(a.getAdministrativeRegionName())){ BmsRegion2 bizRegion = bizRegionMap.get(a.getFirstLevelAdministrativeRegionName()+"_"+a.getSecondaryLevelAdministrativeRegionName()+"_"+a.getAdministrativeRegionName()); - supplier.setRegion2Third(bizRegion.getId()); - supplier.setRegion2Second(bizRegion.getPid()); - String firstRegion2Id = bizRegion.getPathIds().split("_")[0]; - supplier.setRegion2First(firstRegion2Id); supplier.setRegion2Last(bizRegion.getId()); + String[] ids = bizRegion.getPathIds().split("_"); + supplier.setRegion2First(ids[0]); + if(ids.length>1){ + supplier.setRegion2Second(ids[1]); + }else { + supplier.setRegion2Second("0"); + } + if(ids.length>2){ + supplier.setRegion2Third(ids[2]); + }else { + supplier.setRegion2Third("0"); + } } return supplier;