Browse Source

provider amount query master

xiaoyu 3 years ago
parent
commit
b207e68ed4
2 changed files with 3 additions and 3 deletions
  1. 1 1
      admin/control/provider.php
  2. 2 2
      data/model/provider_amount.model.php

+ 1 - 1
admin/control/provider.php

@@ -167,7 +167,7 @@ class providerControl extends SystemControl
             $providers[$provider['provider_id']] = $provider;
         }
         $mod = Model('provider_amount');
-        $list = $mod->getAmountList($condition,50,'*');
+        $list = $mod->getAmountList($condition,50,'*', 'add_time desc', '', true);
         foreach ($list as $key => $value) {
             $list[$key]['provider_name'] = $providers[$value['provider_id']]['name'];
             $list[$key]['store_name'] = $providers[$value['provider_id']]['store_name'];

+ 2 - 2
data/model/provider_amount.model.php

@@ -14,9 +14,9 @@ class provider_amountModel extends Model
         return $this->insert($insert);
     }
 
-    public function getAmountList($condition, $pagesize = '', $field = '*', $order = 'id desc', $limit = '')
+    public function getAmountList($condition, $pagesize = '', $field = '*', $order = 'id desc', $limit = '', $master = false)
     {
-        $list = $this->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->select();
+        $list = $this->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->master($master)->select();
         if (empty($list)) return [];
         return $list;
     }