From edf4d90f404c2d39eb7da46d9f40c6055b393f36 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Fri, 28 Jul 2023 16:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qs/serve/modules/bms/entity/BmsSupplier.java    | 3 +++
 src/main/resources/mapper/bms/BmsSupplierMapper.xml          | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index 98baa1dd..cd914c11 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
@@ -264,6 +264,9 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private String supplierCode;
 
+    @TableField(exist = false)
+    private String isRegionNull;
+
     public List<String> listBizRegionIds(){
         List<String> list = new ArrayList<>();
         list.add(this.getRegion2First());
diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
index 6f1bcc55..60c46f82 100644
--- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml
+++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml
@@ -111,6 +111,11 @@
                     #{selectId}
                 </foreach>
             </if>
+            <if test='query.isRegionNull != null and query.isRegionNull == "1"'>
+                and (`bms_supplier`.`region_last` is null  or  TRIM(`bms_supplier`.`region_last`) = ''
+                 or `bms_supplier`.`region2_last` is null  or  TRIM(`bms_supplier`.`region2_last`) = ''
+                 )
+            </if>
         </where>
         ORDER BY `bms_supplier`.`update_time` DESC
     </select>