From 1a52fa54b9191bfea3e1ca296885a87995972296 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Thu, 3 Jul 2025 19:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20=20sql=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
index 191a921..c142a12 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@@ -974,7 +974,7 @@
         JOIN cosco_blacklist cb ON cb.id = b.blacklist_id
         WHERE b.supplier_id = csb.id
         AND cb.approve_status = 1
-        AND cb.restore_approve_status != 1
+        AND (cb.restore_approve_status is null or cb.restore_approve_status!=1)
         -- 添加当前部门及上级部门id
         <if test="vo.blackListDept != null and vo.blackListDept.size > 0">
             AND cb.dept_id IN
@@ -983,6 +983,7 @@
             </foreach>
         </if>
         )
+        and cas.access_status=1
         <if test="vo.name!=null and vo.name!=''">
             and csb.name like concat('%',#{vo.name},'%')
         </if>