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

@@ -20,6 +20,7 @@ class ProcessLogic extends BaseLogic
     {
     {
         parent::__construct();
         parent::__construct();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
+        $this->model = new Project();
     }
     }
 
 
     /**
     /**
@@ -36,13 +37,13 @@ class ProcessLogic extends BaseLogic
             ->select($filed)->orderBy($order,'desc')->where($map)
             ->select($filed)->orderBy($order,'desc')->where($map)
             ->paginate($row, ['*'], 'page', $page);
             ->paginate($row, ['*'], 'page', $page);
         //数据处理
         //数据处理
-//        if(!empty($lists)){
-//            $lists = $lists->toArray();
-//            foreach ($lists['list'] as $k => $v){
-//                $item = $this->paramHandle($v);
-//                $lists['list'][$k] = $item;
-//            }
-//        }
+        if(!empty($lists)){
+            $lists = $lists->toArray();
+            foreach ($lists['list'] as $k => $v){
+                $item = $this->paramHandle($v);
+                $lists['list'][$k] = $item;
+            }
+        }
         return $this->success($lists);
         return $this->success($lists);
     }
     }