1

.idea/workspace.xml

@@ -4,7 +4,6 @@
     <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" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -290,7 +289,7 @@
       <workItem from="1681174490906" duration="23334000" />
       <workItem from="1681260946292" duration="27381000" />
       <workItem from="1681348081818" duration="22448000" />
-      <workItem from="1681434523223" duration="18442000" />
+      <workItem from="1681434523223" duration="18465000" />
     </task>
     <servers />
   </component>

application/operate/controller/SupplierGoods.php

@@ -35,7 +35,7 @@ class SupplierGoods extends Controller
         $company_id = input('get.company_id');
         $this->supplier_id = $supplier_id;
         $where = [];
-        $where[] = ['is_deleted','=',0];
+        $where[] = ['a.is_deleted','=',0];
         if($supplier_id)$where[] = ['a.supplier_id','=',$supplier_id];
         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');