Merge remote-tracking branch 'origin/develop' into develop

app/data/controller/api/auth/Center.php

@@ -724,6 +724,12 @@ class Center extends Auth
             case 2:
                 $status = $data['status'];
                 $list = DataUserRepairOffer::mk()
+                    ->hasWhere('repair',function (Query $query){
+                        $query->where('is_del',1);
+                    })
+                    ->with(['repair'=>function($query){
+                        $query->withoutField('id,is_del,update_at');
+                    }])
                     ->where('offer_id',$this->uuid)
                     ->where(function ($query) use ($status){
                         $repair_ids = DataUserRepairOffer::mk()
@@ -743,17 +749,12 @@ class Center extends Auth
                                 break;
                         }
                     })
-                    ->hasWhere('repair',function (Query $query){
-                        $query->where('is_del',1);
-                    })
-                    ->with(['repair'=>function($query){
-                        $query->withoutField('id,is_del,update_at');
-                    }])
+
                     ->field('data_user_repair_offer.id,repair_id,offer_id')
                     ->order('id desc')
                     ->group('repair_id')
                     ->paginate();
-                echo DataUserRepairOffer::getLastSql();die;
+               // echo DataUserRepairOffer::getLastSql();die;
                 break;
         }
         $this->success('成功',$list);