Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_字眼替换_20210914

app/Model/OrderModel.php

@@ -506,6 +506,8 @@ class OrderModel extends Model
 
 
         $province = S_str('oms:province');
         $province = S_str('oms:province');
 
 
+        if (!$province) return '';
+        
         $filter = array_filter($province, function($v) use ($region_id) {
         $filter = array_filter($province, function($v) use ($region_id) {
             return $v['region_id'] == $region_id;
             return $v['region_id'] == $region_id;
         });
         });