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 AND cb.dept_id IN @@ -983,6 +983,7 @@ ) + and cas.access_status=1 and csb.name like concat('%',#{vo.name},'%')