bug

application/api/controller/AppointmentTime.php

@@ -123,6 +123,7 @@ class AppointmentTime extends Basic
 
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
+        $result = [];
         if ($params["status"] == 1) {
             $result = $this->getWaitList($pageNo, $pageSize, $params);
         } elseif ($params["status"] == 2) {

application/api/controller/ConvertOrder.php

@@ -115,7 +115,7 @@ class ConvertOrder extends Basic
         $field              = "a.type,a.moneytype,a.money,a.trademark,a.remarks,a.created,a.modified,d.id as agent_id,b.id as report_id,c.id as order_id,c.order_no";
         $collectingBillList = $this->journalaccountsModel->getJournalAccountsListByStatus(1, 2000, $field);
         dump($collectingBillList);
-        $collectingBillArr  = [];
+        $collectingBillArr = [];
         foreach ($collectingBillList as $key => $item) {
             $collectingBillParams = $this->collectingBillBin(0, $item["moneytype"], $item["type"], $item["money"],
                 $item["agent_id"], $item["report_id"], $item["order_id"], $item["order_no"], "---", $item["trademark"],
@@ -340,7 +340,7 @@ class ConvertOrder extends Basic
         $params["order_id"]        = $order_id; //关联order表id
         $params["order_no"]        = $order_no; //订单no
         $params["march_in_remark"] = $march_in_remark; //进场备注
-        $params["march_in_img"]    = "old_img/march_in/" . $march_in_img;//备注图片
+        $params["march_in_img"]    = empty($march_in_img) ? "" : "old_img / march_in / " . $march_in_img;//备注图片
         $params["march_in_area"]   = $march_in_area; //进场地址
         $params["create_time"]     = $create_time; //进场地址
         $params["update_time"]     = $update_time; //进场地址

application/chat/controller/AppChat.php

@@ -217,7 +217,7 @@ class AppChat extends Basic
         $data = [];
         if ($file) {
             $path = ROOT_PATH . 'public' . DS . 'static' . DS . 'chat_image';
-            $info = $file->validate([ 'size' => 512000, 'ext' => 'jpg,png' ])//限制500KB
+            $info = $file->validate([ 'size' => 5120000, 'ext' => 'jpg,png' ])//限制500KB
             ->move($path);
             if ($info) {
                 $img_path    = $info->getSaveName();  //生成的图片路径

application/model/Remarks.php

@@ -132,8 +132,8 @@ class Remarks extends Model
         return Db::table($this->table)
             ->field($field)
             ->alias("a")
-            ->join('o_report b', 'a.apply_id = b.id', 'LEFT')
-            ->join('o_order c', 'b.id = c.f_id', 'LEFT')
+            ->join('o_report b', 'a.apply_id = b.id', 'right')
+            ->join('o_order c', 'b.id = c.f_id', 'right')
             ->join('remarksimgs d', 'a.id = d.remarks_id', 'LEFT')
             ->where($where_)
             ->limit($pageSize)