From 0f1fb24b64153141d585e3436c06f54e5a7f9511 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 May 2024 07:48:03 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisCustomerAddressController.java  | 6 +++++-
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
index d91148519..c84d14ea3 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
@@ -66,9 +66,13 @@ public class EmisCustomerAddressController extends BaseController
     {
         // 需要限制，除总部外，只能查看站点自有数据
         startPage();
-        if(!getLoginUser().getUser().isTopSite()) {
+//        if(!getLoginUser().getUser().isTopSite()) {
+//        }
+
+        if(StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) {
             emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode());
         }
+
         List<EmisCustomerAddress> list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 9b7ef935b..80f7a6ba7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -204,7 +204,7 @@ public class EmisBaseService {
          order.put("ext_data", "{\"k1\":\"阿尔巴尼亚\",\"k2\":\"阿尔巴尼亚快递\",\"k3\":\"阿尔巴尼亚国际特快\",\"k4\":\"1-10工作日\",\"k5\":\"阿尔AL\",\"k6\":\"山东淄博-阿尔巴尼亚地拉那\"}");
 //        order.put("sendPersonAndMobile", "Vancouver"+" "+"1604-683-1088");
          order.put("goods_info", "日常用品");
-         order.put("parcel_qty", "1");
+         order.put("parcel_qty", 1);
          order.put("create_day", "2023-12-30");
 
          if(StringUtils.isEmpty(waybill.getBlPrint())) {