wupengfei 2 лет назад
Родитель
Сommit
dac228ce93
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 1
      .idea/workspace.xml
  2. 1 1
      application/operate/controller/SupplierGoods.php

+ 2 - 1
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -290,7 +291,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="15418000" />
+      <workItem from="1681692707179" duration="15431000" />
     </task>
     <servers />
   </component>

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

@@ -35,7 +35,7 @@ class SupplierGoods extends Controller
         $company_id = input('get.company_id');
         $third_classify = input('get.third_classify');
         $this->supplier_id = $supplier_id;
-        $this->supplier_list = \app\common\model\Supplier::getSupplierName();
+        $this->supplier_list = \app\common\model\Supplier::getSupplierName(0);
         //$this->company_list = \app\common\model\Company::getCompanyName();
         $where = [];
         $where[] = ['a.is_deleted','=',0];