wugg 1 year ago
parent
commit
0601f44a8c
2 changed files with 13 additions and 12 deletions
  1. 3 2
      app/admin/controller/DepartTips.php
  2. 10 10
      app/admin/controller/Track.php

+ 3 - 2
app/admin/controller/DepartTips.php

@@ -3,13 +3,14 @@
 
 namespace app\admin\controller;
 
-
 use think\App;
 use think\Exception;
 use think\facade\Db;
 use think\facade\Validate;
 class DepartTips extends Base{
-	public function __construct(App $app) {parent::__construct($app);}
+	public function __construct(App $app) {
+		parent::__construct($app);
+	}
 
 	public function list(){
 		$post = $this->request->only(["year"=>"","month"=>"","companyNo"=>"","page"=>1,"size"=>15],"post","trim");

+ 10 - 10
app/admin/controller/Track.php

@@ -127,13 +127,13 @@ class Track extends Base
 	    $PayObject = new \app\admin\model\Track();
 	    $objall= $PayObject->where(['id'=>$param['cids']])->select();
 	    if($objall->isEmpty()) $this->error('对账数据不能为空');
-	    $supplierNo= array_column($objall,'supplierNo');
-        $supplierName= array_column($objall,'supplierName');
+	    $supplierNo= array_column($objall->toArray(),'supplierNo');
+        $supplierName= array_column($objall->toArray(),'supplierName');
         if(count(array_unique($supplierNo))>1){
             $this->error('对账数据供应商不唯一');
         }
-        $companyNo= array_column($objall,'companyNo');
-        $companyName= array_column($objall,'companyName');
+        $companyNo= array_column($objall->toArray(),'companyNo');
+        $companyName= array_column($objall->toArray(),'companyName');
         if(count(array_unique($companyNo))>1){
             $this->error('对账数据业务公司不唯一');
         }
@@ -204,13 +204,13 @@ class Track extends Base
 	    $PayInfo = $pay->where(['payNo'=>$param['payNo']])->findOrEmpty();
 	    if($PayInfo->isEmpty()) $this->error('未找到对账单数据');
 	    
-	    $supplierNo= array_column($objall,'supplierNo');
-        $supplierName= array_column($objall,'supplierName');
+	    $supplierNo= array_column($objall->toArray(),'supplierNo');
+        $supplierName= array_column($objall->toArray(),'supplierName');
         if(count(array_unique($supplierNo))>1){
             $this->error('对账数据供应商不唯一');
         }
-        $companyNo= array_column($objall,'companyNo');
-        $companyName= array_column($objall,'companyName');
+        $companyNo= array_column($objall->toArray(),'companyNo');
+        $companyName= array_column($objall->toArray(),'companyName');
         if(count(array_unique($companyNo))>1){
             $this->error('对账数据业务公司不唯一');
         }
@@ -222,8 +222,8 @@ class Track extends Base
         $trackArr = PayInfo::where(['payNo'=>$param['payNo'],'is_del'=>0,'status'=>1])->column('cgdNo');
         $add=$remove=[];
         if(empty($trackArr)==false){
-        	$remove= array_diff($trackArr,array_column($objall,'TrackCode'));
-        	$add= array_diff(array_column($objall,'TrackCode'),$trackArr);
+        	$remove= array_diff($trackArr,array_column($objall->toArray(),'TrackCode'));
+        	$add= array_diff(array_column($objall->toArray(),'TrackCode'),$trackArr);
         }
         $data = [
         	    'apply_id'=>$this->uid,