From eadcf07b3d08c9473e5f8e39668d90d6fc8a765e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 14 May 2024 02:23:19 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCustomerAddressController.java   | 11 ++++++-----
 .../resources/mapper/EmisCustomerAddressMapper.xml    |  3 ++-
 2 files changed, 8 insertions(+), 6 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 39fae389a..d91148519 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,6 +52,9 @@ public class EmisCustomerAddressController extends BaseController
     public TableDataInfo list(EmisCustomerAddress emisCustomerAddress)
     {
         startPage();
+        if(!getLoginUser().getUser().isTopSite()) {
+            emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode());
+        }
         List<EmisCustomerAddress> list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress);
         return getDataTable(list);
     }
@@ -62,12 +65,10 @@ public class EmisCustomerAddressController extends BaseController
     public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress)
     {
         // 需要限制，除总部外，只能查看站点自有数据
-        String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode();
-//        if(!"88888".equals(ownerSiteCode)) {
-            emisCustomerAddress.setUseSiteCode(ownerSiteCode);
-//        }
-
         startPage();
+        if(!getLoginUser().getUser().isTopSite()) {
+            emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode());
+        }
         List<EmisCustomerAddress> list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 4b7ee7ba9..5d00eb5c3 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -80,7 +80,6 @@
             <if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</if>
             <if test="blSiteDefaultFlag != null  and blSiteDefaultFlag != ''"> and bl_site_default_flag like concat('%', #{blSiteDefaultFlag}, '%')</if>
             <if test="useSite != null  and useSite != ''"> and use_site = #{useSite}</if>
-            <if test="useSiteCode != null  and useSiteCode != ''"> and use_site_code=#{useSiteCode}</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
@@ -90,6 +89,8 @@
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
+            <if test="useSiteCode != null  and useSiteCode != ''"> and use_site_code=#{useSiteCode}</if>
+
             <if test="searchValue != null  and searchValue != ''">
                 and ( name like concat(#{searchValue}, '%') or  phone like concat(#{searchValue}, '%') or company like concat(#{searchValue}, '%') )
              </if>