ad

app/admin/controller/Exec.php

@@ -19,7 +19,7 @@ class Exec extends \app\admin\BaseController{
 		if($param['relaComNo']!='')$conditon[]=["companyNo","=",$param['relaComNo']];
 		if($param['status']!=='')$conditon[]=["status","=",$param['status']];
 		$count=Db::name("exec")->where($conditon)->count();
-		$total = ceil($count/$param['szie']);
+		$total = ceil($count/$param['size']);
 		$page =$param['page']>=$total ? intval($param['page']):intval($total);
 		$list=Db::name("exec")->where($conditon)->page($page,intval($param['size']))->select()->toArray();
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
@@ -112,7 +112,7 @@ class Exec extends \app\admin\BaseController{
 	}
 
 	public function loglist(){
-		$param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>"","companyNo"=>"",'relaComNo'=>''],"post","trim");
+		$param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
 		$where=[["is_del","=",0]];
 		if($param['name']!='')$where[]=["name","like","%{$param['name']}%"];
 		if($param['apply_name']!='')$where[]=["apply_name","like","%{$param['apply_name']}%"];
@@ -122,7 +122,7 @@ class Exec extends \app\admin\BaseController{
 		if($param['companyNo']!='')$where[]=["companyNo","=",$param['companyNo']];
 		if($param['relaComNo']!='')$where[]=["companyNo","=",$param['relaComNo']];
 		$count=Db::name("exec_log")->where($where)->count();
-		$total = ceil($count/$param['szie']);
+		$total = ceil($count/$param['size']);
 		$page =$param['page']>=$total ? intval($param['page']):intval($total);
 		$list=Db::name("exec_log")->where($where)->page($page,intval($param['size']))->order("id desc")->select()
 		->toArray();

app/command/Report.php

@@ -38,12 +38,15 @@ class Report extends Command
     {
         // 指令输出
 //  $info = Cache::store('redis')->handler()->rpop($this->key);
+	    ini_set ('memory_limit', '512M') ;
         $date=date("Y-m-d H:i:s");
         Db::startTrans();
         try{
-        	$param =Db::name("exec_log")->where([["expiretime","<=",$date],["status","=",1],["is_del","=",0]])->lock("true")
-        	->find();
-        	if($param){
+        	$param =Db::name("exec_log")->where([["expiretime","<=",$date],["status","=",1],["is_del","=",0]])
+		        ->findOrEmpty();
+
+        if(isset($param) && !empty($param)){
+	        Db::name("exec_log")->where("id",$param['id'])->lock(true)->find();
         switch ($param['action']){
 			case 'A':
 				$method="A";