From 27dbd1842229dcf3cab63e737bd8f1c32a7a2522 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 17 Jan 2025 08:07:23 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisSupplierController.java    | 4 +++-
 emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml  | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
index e7ff2236c..82a292d35 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
@@ -51,10 +51,12 @@ public class EmisSupplierController extends BaseController
     /**
      * 查询公司供应商表列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisSupplier:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisSupplier:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisSupplier emisSupplier)
     {
+        setPrivParams(emisSupplier);
+
         startPage();
         List<EmisSupplier> list = emisSupplierService.selectEmisSupplierList(emisSupplier);
         return getDataTable(list);
diff --git a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
index 089ac781b..68e394ea3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settledType != null  and settledType != ''"> and settled_type=#{settledType}</if>
             <if test="transType != null  and transType != ''"> and trans_type=#{transType}</if>
 
-            <if test="bizSite != null  and bizSite != ''"> and ( FIND_IN_SET(#{bizSite},biz_site) or #{bizSite}=owner_site) </if>
+            <if test="bizSite != null  and bizSite != ''"> and FIND_IN_SET(#{bizSite},biz_site) </if>
 
             <if test="bizSiteName != null  and bizSiteName != ''"> and biz_site_name like concat('%', #{bizSiteName}, '%')</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
@@ -67,6 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <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="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and FIND_IN_SET(#{params.privSiteCode},biz_site)
+            </if>
+
         </where>
         order by create_time desc
     </select>