Merge remote-tracking branch 'origin/v1.0' into v1.0

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());

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>