4 Commitit 1c46766a30 ... 53c178fcfa

Tekijä SHA1 Viesti Päivämäärä
  xupuyuan 53c178fcfa Merge branch 'dev-xpy' into dev 6 kuukautta sitten
  xupuyuan 5db1bdfef3 商家后台-商品中规格模板-增加倒序排序 6 kuukautta sitten
  xupuyuan 4983aea71d Merge branch 'dev-xpy' into dev 6 kuukautta sitten
  xupuyuan 4d21a7eb54 商家后台-商品中规格模板-修复排序错误 6 kuukautta sitten

+ 1 - 1
app/common/dao/store/StoreAttrTemplateDao.php

@@ -111,6 +111,6 @@ class StoreAttrTemplateDao extends BaseDao
111
 
111
 
112
     public function getList($merId)
112
     public function getList($merId)
113
     {
113
     {
114
-        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('attr_template_id,template_name,template_value')->select();
114
+        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('attr_template_id,template_name,template_value')->order('attr_template_id DESC')->select();
115
     }
115
     }
116
 }
116
 }

+ 2 - 1
app/common/repositories/store/StoreAttrTemplateRepository.php

@@ -58,7 +58,8 @@ class StoreAttrTemplateRepository extends BaseRepository
58
     public function getList($merId, array $where, $page, $limit)
58
     public function getList($merId, array $where, $page, $limit)
59
     {
59
     {
60
         $query = $this->dao->search($merId, $where);
60
         $query = $this->dao->search($merId, $where);
61
-        $count = $query->count($this->dao->getPk());
61
+        $CountQuery = clone $query;
62
+        $count = $CountQuery->count($this->dao->getPk());
62
         $list = $query->page($page, $limit)->select();
63
         $list = $query->page($page, $limit)->select();
63
         return compact('count', 'list');
64
         return compact('count', 'list');
64
     }
65
     }