From c29e0d624eaceb5d7db1bd078a9b9b4a72d7ef49 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 17:42:51 +0800
Subject: [PATCH] fix(supplier): 修复供应商白名单查询条件判断
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 248b940..d296028 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -21,12 +21,45 @@
T1.create_user,
T1.update_time,
T1.update_user,
- T1.tenant_id
+ 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 supplier_name = #{supplierManageDto.supplierName}
+ AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
+ </if>
+ <if test="supplierManageDto.isWhite != null and supplierManageDto.isWhite.toString() != '' ">
+ AND T1.is_white LIKE CONCAT('%',#{supplierManageDto.isWhite},'%')
+ </if>
+ </where>
+ </select>
+
+ <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
+ SELECT
+ T1.id,
+ T1.supplier_name,
+ T1.taxpayer_identification_num,
+ T1.company_address,
+ T1.company_phone,
+ T1.bank_account_name,
+ T1.bank_account_num,
+ T1.contact_user_name,
+ T1.contact_user_phone,
+ T1.maintain_user_id,
+ T1.maintain_time,
+ T1.create_time,
+ T1.create_user,
+ T1.update_time,
+ T1.update_user,
+ T1.tenant_id,
+ 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>
</where>
</select>
--
Gitblit v1.9.3