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 5244f7086..b553b04b2 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 @@ -52,8 +52,10 @@ public class EmisCustomerAddressController extends BaseController public TableDataInfo list(EmisCustomerAddress emisCustomerAddress) { startPage(); - if(!getLoginUser().getUser().isTopSite()) { - emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + if (StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) { + if(!getLoginUser().getUser().isTopSite()) { + emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + } } List list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress); return getDataTable(list); @@ -66,9 +68,12 @@ public class EmisCustomerAddressController extends BaseController { // 需要限制,除总部外,只能查看站点自有数据 startPage(); - if(StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) { - emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + if (StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) { + if(!getLoginUser().getUser().isTopSite()) { + emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + } } + List list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress); return getDataTable(list); }