作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -36,10 +36,9 @@ class ProcessLogic extends BaseLogic @@ -36,10 +36,9 @@ class ProcessLogic extends BaseLogic
36 ->with('deploy_optimize')->with('payment')->with('process') 36 ->with('deploy_optimize')->with('payment')->with('process')
37 ->select($filed)->orderBy($order,'desc')->where($map) 37 ->select($filed)->orderBy($order,'desc')->where($map)
38 ->paginate($row, ['*'], 'page', $page); 38 ->paginate($row, ['*'], 'page', $page);
39 - var_dump($lists);  
40 - die();  
41 //数据处理 39 //数据处理
42 if(!empty($lists)){ 40 if(!empty($lists)){
  41 + $lists = $lists->toArray();
43 foreach ($lists['list'] as $k => $v){ 42 foreach ($lists['list'] as $k => $v){
44 $item = $this->paramHandle($v); 43 $item = $this->paramHandle($v);
45 $lists['list'][$k] = $item; 44 $lists['list'][$k] = $item;