From 41d35c56043108b66a14e7a2d2d13bedfc2508e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:34:42 +0800
Subject: [PATCH] Merge branch 'dev_New' into pcdz

---
 src/main/resources/mapper/basic/SupplierManageMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 9e65903..890468c 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -8,6 +8,7 @@
         SELECT
         T1.id,
         T1.supplier_name,
+        T1.supplier_type,
         T1.taxpayer_identification_num,
         T1.company_address,
         T1.company_phone,
@@ -22,12 +23,16 @@
         T1.update_time,
         T1.update_user,
         T1.tenant_id,
+        T1.is_white,
         T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>
             <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
                 AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
+            </if>
+            <if test="supplierManageDto.isWhite != null">
+                AND T1.is_white = #{supplierManageDto.isWhite}
             </if>
         </where>
     </select>
@@ -50,6 +55,7 @@
         T1.update_time,
         T1.update_user,
         T1.tenant_id,
+        T1.is_white,
         T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
@@ -57,6 +63,9 @@
             <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
                 AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
             </if>
+            <if test="supplierManageDto.isWhite != null">
+                AND T1.is_white = #{supplierManageDto.isWhite}
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3