Merge branch 'zjl_crm_v3_20210903'

8834f8e9 · 朱继来 · 2f415eae · 1348f44f · 8834f8e9
Commit 8834f8e9 authored Sep 17, 2021 by 朱继来
Showing with 2 additions and 0 deletions
app/Model/OrderModel.php
--- a/app/Model/OrderModel.php
+++ b/app/Model/OrderModel.php
@@ -506,6 +506,8 @@ class OrderModel extends Model

        $province = S_str('oms:province');

+        if (!$province) return '';
+        
        $filter = array_filter($province, function($v) use ($region_id) {
            return $v['region_id'] == $region_id;
        });