Merge branch 'dev' into dev_wf

app/admin/controller/Customer.php

@@ -15,6 +15,11 @@ class Customer extends BaseController
     {
         $post = $this->post;
         $condition=[];
+//        $roleid = $this->roleid;
+//        $check = checkRole($roleid,'73');
+//        if($check){
+//        	$condition[]=["apply_id","=",$this->uid];
+//        }
         isset($post['company'])&&$post['company']!=""? $condition[]=['companyName|contactor',"like","%{$post['company']}%"] : "";
         isset($post['contactor'])&&$post['contactor']!=""? $condition[]=['contactor',"like","%{$post['contactor']}%"] :
         isset($post['companyNo'])&&$post['companyNo']!=""? $condition[]=['companyNo',"=",$post['companyNo']] :

app/admin/controller/Exec.php

@@ -116,6 +116,10 @@ class Exec extends \app\admin\BaseController{
 	public function loglist(){
 		$param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
 		$where=[["is_del","=",0]];
+		$check = checkRole($this->roleid,147);
+        if($check){
+            $where[]=["apply_id","=",$this->uid];
+        }
 		if($param['name']!='')$where[]=["name","like","%{$param['name']}%"];
 		if($param['apply_name']!='')$where[]=["apply_name","like","%{$param['apply_name']}%"];
 		if($param['type']!='')$where[]=["type","=",$param['type']];

app/admin/controller/InterOrder.php

@@ -20,6 +20,10 @@ class InterOrder extends \app\admin\BaseController{
 		$param = $this->request->only(["page"=>1,"size"=>10,'cgdNo'=>"","qrdNo"=>"","khNo"=>"",
 		"supplierNo"=>"","companyNo"=>"","starttime"=>"","endtime"=>"","sale_name"=>"","cgd_saler"=>""],"post","trim");
 		$where=[];
+		 $check = checkRole($this->roleid,143);
+        if($check){
+            $where[]=["a.apply_id","=",$this->uid];
+        }
 		if($param['cgdNo']!="") $where[]=["a.cgdNo","like","%{$param['cgdNo']}%"];
 		if($param['qrdNo']!="") $where[]=["a.orderCode","like","%{$param['qrdNo']}%"];
 		if($param['khNo']!="") $where[]=["b.customerNo","like","%{$param['khNo']}%"];

app/admin/controller/OrderInv.php

@@ -1048,6 +1048,11 @@ class OrderInv extends BaseController{
         $condition=[["a.is_del","=",0]];
         $start = isset($this->post['start'])&&$this->post['start']!="" ? trim($this->post['start']) :"";
         $end = isset($this->post['end'])&&$this->post['end']!="" ? trim($this->post['end']) :"";
+         $roleid = $this->roleid;
+        $check = checkRole($roleid,'84');
+        if($check){
+        	$condition[]=["a.apply_id","=",$this->uid];
+        }
         if($start!=""){
             $condition[]=["a.addtime",">=",$start." 00:00:00"];
         }
@@ -1174,6 +1179,11 @@ class OrderInv extends BaseController{
          $page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
         $size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
         $condition=[["b.is_del","=",0]];
+         $roleid = $this->roleid;
+        $check = checkRole($roleid,'89');
+        if($check){
+        	$condition[]=["a.apply_id","=",$this->uid];
+        }
         $start = isset($this->post['start'])&&$this->post['start']!="" ? trim($this->post['start']) :"";
         $end = isset($this->post['end'])&&$this->post['end']!="" ? trim($this->post['end']) :"";
         $companyNo = isset($this->post['companyNo'])&&$this->post['companyNo']!="" ? trim($this->post['companyNo']) :"";
@@ -1626,6 +1636,11 @@ class OrderInv extends BaseController{
     	$page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
         $size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
         $condition=[["is_del","=",0],["FPLXDM","in",["004",'028']]];
+          $roleid = $this->roleid;
+        $check = checkRole($roleid,'110');
+        if($check){
+        	$condition[]=["apply_id","=",$this->uid];
+        }
         $invRed=isset($this->post["invRed"])&&$this->post["invRed"]!=''?trim($this->post["invRed"]):"";
         if($invRed!=''){
         	$condition[]=["invRed","like","%$invRed%"];
@@ -2042,6 +2057,11 @@ class OrderInv extends BaseController{
     public function tikcetList(){
     	$post=$this->request->only(["invNo"=>"","companyNo"=>"","relaComNo"=>"","page"=>1,"size"=>15],"post","trim");
     	$where=[];
+    	 $roleid = $this->roleid;
+        $check = checkRole($roleid,'88');
+        if($check){
+        	$where[]=["b.apply_id","=",$this->uid];
+        }
     	if($post["invNo"]!="") $where[]=["a.invNo","=",$post['invNo']];
     	if($post["companyNo"]!="") $where[]=["b.inv_out","=",$post['companyNo']];
     	if($post["relaComNo"]!="") $where[]=["b.inv_out","=",$post['relaComNo']];

app/admin/controller/OrderPay.php

@@ -260,6 +260,11 @@ class OrderPay extends BaseController{
     //资金信息列表
     public function list(){
         $condition=[];
+//         $roleid = $this->roleid;
+//        $check = checkRole($roleid,'85');
+//        if($check){
+//        	$condition[]=["apply_id","=",$this->uid];
+//        }
         $page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
         $size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
         $name =isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
@@ -327,7 +332,11 @@ class OrderPay extends BaseController{
        $page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
         $size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
         $condition =[["a.is_del","=",0],["b.is_del","=",0]];
-
+		 $roleid = $this->roleid;
+        $check = checkRole($roleid,'87');
+        if($check){
+        	$condition[]=["a.apply_id","=",$this->uid];
+        }
         $name =isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
         $bank =isset($this->post['bank'])&&$this->post['bank']!=""? trim($this->post['bank']):"";
         $start =isset($this->post['start'])&&$this->post['start']!=""? trim($this->post['start']):"";
@@ -519,7 +528,12 @@ class OrderPay extends BaseController{
     * @throws \think\db\exception\ModelNotFoundException
      */
     public function returnList(){
-
+		$condition=[["a.is_del","=",0]];
+		  $roleid = $this->roleid;
+        $check = checkRole($roleid,'90');
+        if($check){
+        	$condition[]=["a.apply_id","=",$this->uid];
+        }
         $page=isset($this->post['page'])&&$this->post['page']!='' ? intval($this->post['page']):1;
         $size=isset($this->post['size'])&&$this->post['size']!='' ? intval($this->post['size']):15;
         $tradNo =isset($this->post['tradNo'])&&$this->post['tradNo']!=''?trim($this->post['tradNo']):"";

app/admin/controller/Payment.php

@@ -36,6 +36,10 @@ class Payment extends BaseController
     {
         $post = $this->post;
         $condition = "a.is_del=0 ";
+        $check = checkRole($this->roleid,[79,119]);
+        if($check){
+            $condition.=" and b.apply_id={$this->uid}";
+        }
          $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
         :"";
         $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
@@ -132,10 +136,10 @@ class Payment extends BaseController
     {
         $post = $this->post;
         $condition = [["is_del","=",0]];
-//        $check = checkRole($this->roleid,49);
-//        if($check){
-//            $condition[]=["apply_id","=",$this->uid];
-//        }
+        $check = checkRole($this->roleid,[77,117]);
+        if($check){
+            $condition[]=["apply_id","=",$this->uid];
+        }
         $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
         :"";
         $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
@@ -818,10 +822,10 @@ class Payment extends BaseController
         $post = $this->post;
         $condition = [["cgdSource|cgdType","<>",1],['is_del',"=",0]];
 
-//        $check = checkRole($this->roleid,46);
-//        if($check){
-//            $condition []=["ownerid","=",$this->uid];
-//        }
+        $check = checkRole($this->roleid,[76,116]);
+        if($check){
+            $condition []=["ownerid","=",$this->uid];
+        }
         $sequenceNo = isset($post['sequenceNo']) && $post['sequenceNo']!='' ? trim($post['sequenceNo']) :"";
         if($sequenceNo!=""){
           $condition []=["sequenceNo","like","%$sequenceNo%"];
@@ -1298,6 +1302,10 @@ class Payment extends BaseController
         $post = $this->post;
         $condition = [["a.is_del","=",0 ],["b.is_del","=",0 ]];
         $invtype = isset($post['invType'])&&$post['invType']!='' ? intval($post['invType']):"";
+        $check = checkRole($this->roleid,[82,120]);
+        if($check){
+            $condition []=["a.apply_id","=",$this->uid];
+        }
         if ($invtype!=''){
             $condition[]=["a.invType","=",$invtype];
         }
@@ -1617,6 +1625,10 @@ class Payment extends BaseController
 		$param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"",
 		"status"=>"","hpNo"=>"","payNo"=>"","page"=>1,"size"=>15],"post","trim");
 		$condition=[["a.is_del","=",0],['a.returnType',"=",1]];
+		 $check = checkRole($this->roleid,[132,130]);
+        if($check){
+            $condition []=["a.apply_id","=",$this->uid];
+        }
 		if($param['relaComNo']!="") $condition[]=["b.companyNo|b.supplierNo","=",$param['relaComNo']];
 		if($param['companyNo']!="") $condition[]=["b.companyNo","=",$param['companyNo']];
 		if($param['supplierNo']!="") $condition[]=["b.supplierNo","=",$param['supplierNo']];
@@ -1744,6 +1756,10 @@ class Payment extends BaseController
 		$param =$this->request->only(["relaComNo"=>"","companyNo"=>"","supplierNo"=>"","start"=>"","end"=>"","returnCode"=>"","payNo"=>"",
 		"status"=>"","dzNo"=>"","page"=>1,"size"=>15],"post","trim");
 		$condition=[["a.is_del","=",0],['a.returnType',"=",2]];
+		  $check = checkRole($this->roleid,[131,129]);
+        if($check){
+            $condition []=["a.apply_id","=",$this->uid];
+        }
 		if($param['relaComNo']!="") $condition[]=["b.companyNo|b.supplierNo","=",$param['relaComNo']];
 		if($param['companyNo']!="") $condition[]=["b.companyNo","=",$param['companyNo']];
 		if($param['supplierNo']!="") $condition[]=["b.supplierNo","=",$param['supplierNo']];

app/admin/controller/Sale.php

@@ -17,6 +17,11 @@ class Sale extends BaseController{
 
         $post =$this->request->param();
         $condition = [['a.is_del',"=",0]];
+         $roleid = $this->roleid;
+        $check = checkRole($roleid,'86');
+        if($check){
+        	$condition[]=["a.ownerid","=",$this->uid];
+        }
         $page = isset($post['page'])&&$post['page']!==''?intval($post['page']):1;
         $size = isset($post['size'])&&$post['size']!==''?intval($post['size']):15;
         $start =isset($post['start'])&&$post['start']!==''?trim($post['start']):'';

app/admin/controller/TagGood.php

@@ -57,6 +57,11 @@ class TagGood extends BaseController{
         	 $companyNo = isset($this->post['companyNo'])&& $this->post['companyNo']!="" ? trim($this->post['companyNo']) :"";
         }
         $condition =[["is_del","=",0]];
+        $roleid = $this->roleid;
+        $check = checkRole($roleid,'101');
+        if($check){
+        	$condition[]=["apply_id","=",$this->uid];
+        }
         if($type!=''){
             $condition[]=["type","=",$type];
         }
@@ -67,9 +72,10 @@ class TagGood extends BaseController{
         if($tagName!=''){
           $condition[]=["tag_name","like","%$tagName%"];
         }
-          if($companyNo!=''){
+        if($companyNo!=''){
           $condition[]=["companyNo","=",$companyNo];
         }
+
         $count =Db::name("order_tag")->where($condition)->count();
         $total=ceil($count/$size);
         $page = $page>=$total ? intval($total):$page;

app/command/good.php

@@ -23,7 +23,7 @@ class good extends Command
     protected function execute(Input $input, Output $output)
     {
         // 指令输出
-	    $this->date=date("Y-m-d 00:00:00",time());
+	    $this->date=date("Y-m-d H:i:s",time()-3600);
 	    $goodset =Cache::store("redis")->get("goodSet");
 	    if($goodset ==1) return;
 	    Cache::store("redis")->set("goodSet",1,1800);

app/common.php

@@ -326,7 +326,7 @@ function curl_request($url,$post='',$header=[]){
 * @throws \think\db\exception\ModelNotFoundException
  */
 function checkRole($roleid,$menu){
-    $roleinfo = \think\facade\Db::name("role_action")->where([['role_id',"=",$roleid],["status","=",1]])->find();
+    $roleinfo = \think\facade\Db::name("role_action")->where([['role_id',"in",$roleid],["status","=",1]])->find();
     if($roleinfo['private_data']!=""){
 
         $private = explode(",",$roleinfo['private_data']);