wupengfei преди 2 години
родител
ревизия
50246c7498
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      .idea/workspace.xml
  2. 1 1
      application/operate/controller/SupplierGoods.php

+ 1 - 1
.idea/workspace.xml

@@ -289,7 +289,7 @@
       <workItem from="1681174490906" duration="23334000" />
       <workItem from="1681260946292" duration="27381000" />
       <workItem from="1681348081818" duration="22448000" />
-      <workItem from="1681434523223" duration="18465000" />
+      <workItem from="1681434523223" duration="18526000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/operate/controller/SupplierGoods.php

@@ -40,7 +40,7 @@ class SupplierGoods extends Controller
         if($company_id)$where[] = ['a.company_id','=',$company_id];
         $query = $this->_query($this->table)->where($where)->like('a.name')->field('a.*,b.title supplier_name ,c.title company_name');
         $query->leftJoin('Supplier b','b.id = a.supplier_id')->leftJoin('Company c','c.id = a.company_id');
-        $query->order(' sort desc , id desc')->page();
+        $query->order(' a.sort desc , a.id desc')->page();
     }
 
     /**