客户和供应商的regionName使用行政区划的fullname

更新行政区划数据
6 years ago · 1cff8d22b1
parent 6f936d1c43
commit 1cff8d22b1
6 changed files with 5 additions and 5 deletions
--- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java
+++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java
@ -78,7 +78,7 @@ public class CustomerService {
            SysRegion matched = Util.find(regions, item -> customerVo.getRegion().equals(item.getId()));

            if (matched != null) {
-                customerVo.setRegionName(matched.getName());
+                customerVo.setRegionName(matched.getFullname());
            }
        });

--- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java
+++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java
@ -77,7 +77,7 @@ public class SupplierService {
        list.forEach(supplierVo -> {
            SysRegion matched = Util.find(regions, item -> supplierVo.getRegion().equals(item.getId()));
            if (matched != null) {
-                supplierVo.setRegionName(matched.getName());
+                supplierVo.setRegionName(matched.getFullname());
            }
        });

--- a/java/db/my.rar
+++ b/java/db/my.rar
--- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java
@ -78,7 +78,7 @@ public class SysCustomerService {
            SysRegion matched = Util.find(regions, item -> customerVo.getRegion().equals(item.getId()));

            if (matched != null) {
-                customerVo.setRegionName(matched.getName());
+                customerVo.setRegionName(matched.getFullname());
            }
        });

--- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java
@ -77,7 +77,7 @@ public class SysSupplierService {
        list.forEach(supplierVo -> {
            SysRegion matched = Util.find(regions, item -> supplierVo.getRegion().equals(item.getId()));
            if (matched != null) {
-                supplierVo.setRegionName(matched.getName());
+                supplierVo.setRegionName(matched.getFullname());
            }
        });

--- a/vue/public/static/json/region-pca.json
+++ b/vue/public/static/json/region-pca.json