ad

app/admin/controller/After.php

@@ -238,7 +238,8 @@ class After extends Base
 //            $condition .="a.cgderid = {$this->uid} or a.apply_id in (".implode(',',$role['write']).")";
 //        }
         $role = $this->checkDataShare();
-        if (!empty($role[DataGroupModel::$type_全部])) $condition .="a.cgderid = {$this->uid} or a.apply_id in (".implode(',',$role[DataGroupModel::$type_全部]).")";
+        if (!empty($role[DataGroupModel::$type_全部])) $condition .="a.cgderid = {$this->uid} or a.person_id= {$this->uid} or a.apply_id in ("
+        .implode(',',$role[DataGroupModel::$type_全部]).")";
 
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];

app/command/NowReportHandle.php

@@ -282,7 +282,7 @@ class NowReportHandle extends Command
 	'' as '发货方式',
 	if(ifnull(wsr.is_th,wor.is_th)=0,'否','是') as '供应商是否同意退货',
 	if(wps.pay_type='0','现结',if(wps.pay_type='1','月结',if(wps.pay_type='2','双月结',wps.pay_type))) as '付款方式'
-	")->cursor();
+	")->order("wtd.addtime")->cursor();
 
         $com = [];
         foreach ($data as $value) {
@@ -300,7 +300,7 @@ class NowReportHandle extends Command
             }else{
                 $good= Db::name("good_basic")->where(["spuCode"=>$value['产品编码']])->find();
             }
-            if($value['单位']==1&& $value['退货采购货款']!=0){
+            if($value['单位']==1&& $value['退货采购货款']==0){
             	$returninfo = Db::name("return_info")->where(["returnCode"=>$value['thCode']])->field("sum(origin_price * num) as cgd_total")->find();
             	$value['退货采购货款'] = $returninfo['cgd_total']??0;
             }