1

.idea/workspace.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <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/api/controller/Bill.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Bill.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/validate/BillVali.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/validate/BillVali.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -211,7 +209,7 @@
       <workItem from="1672793409629" duration="408000" />
       <workItem from="1672793834653" duration="24306000" />
       <workItem from="1672880479757" duration="22897000" />
-      <workItem from="1672966192005" duration="11379000" />
+      <workItem from="1672966192005" duration="11398000" />
     </task>
     <servers />
   </component>

application/api/controller/Bill.php

@@ -114,7 +114,9 @@ class Bill extends Base
         $sel_where['b.user_id'] =  $this->user_id;
         $sel_where['b.is_deleted'] =  0;
         if($type = input('get.type'))$sel_where['b.type'] = $type;
-        $list = BillHeader::field('b.*,t.title type_name')->where($sel_where)
+        $list = BillHeader::field('b.*,t.title type_name')
+            ->alias('b')
+            ->where($sel_where)
             ->leftJoin('BillType t','t.id = b.type')
             ->order('b.id desc')
             ->limit($this->off_set,$this->page_num)