1

application/api_broker/service/BargainService.php

@@ -14,15 +14,18 @@ use think\Log;
  */
 class BargainService
 {
-    /**
-     * 获取成交报告列表
+    /**获取成交报告列表
      * @param $pageNo
      * @param $pageSize
      * @param $submit_agent_id
      * @param $status
      * @param $is_my_correlation
      * @param $keyword
-     * @return array|false|\PDOStatement|string|\think\Collection
+     * @param $bargain_id
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getBargainList($pageNo, $pageSize, $submit_agent_id, $status, $is_my_correlation, $keyword, $bargain_id)
     {
@@ -32,7 +35,8 @@ class BargainService
             $aService = new VerifyService();
             $ids      = $aService->getAgentsByAgentId($submit_agent_id);
 
-            $condition["ids"] = $ids;
+            $condition["ids"]             = $ids;
+            $condition["submit_agent_id"] = $submit_agent_id;
         } else {
             $condition["father_id"] = 0;
         }
@@ -51,7 +55,7 @@ class BargainService
                 $condition["status"] = 21;
                 break;
             case 5://调账->搜成交报告 不包括 待撤销和已撤销
-                $condition["status"] = array('not in','20,21');
+                $condition["status"] = array('not in', '20,21');
                 break;
             default:
         }
@@ -74,7 +78,7 @@ class BargainService
         return $convertResult;
     }
 
-    public function getBargainListV2($pageNo, $pageSize, $submit_agent_id, $status, $is_my_correlation, $keyword, $bargain_id,$type)
+    public function getBargainListV2($pageNo, $pageSize, $submit_agent_id, $status, $is_my_correlation, $keyword, $bargain_id, $type)
     {
 
         $condition = [];
@@ -82,7 +86,8 @@ class BargainService
             $aService = new VerifyService();
             $ids      = $aService->getAgentsByAgentId($submit_agent_id);
 
-            $condition["ids"] = $ids;
+            $condition["ids"]             = $ids;
+            $condition["submit_agent_id"] = $submit_agent_id;
         } else {
             $condition["father_id"] = 0;
         }
@@ -101,7 +106,7 @@ class BargainService
                 $condition["status"] = 21;
                 break;
             case 5://调账->搜成交报告 不包括 待撤销和已撤销
-                $condition["status"] = array('not in','20,21');
+                $condition["status"] = array('not in', '20,21');
                 break;
             default:
         }