From 066fffc3e2d8107df55dd41d4d50dbe5b69886b1 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Sat, 28 Apr 2018 10:22:40 +0800
Subject: [PATCH] 解决上传原始数据接口bug

---
 Yfs/Domain/Data.php |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index 8237215..e1b51c4 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -69,13 +69,23 @@
      * ������������������������
      * @return [type] [description]
      */
-    public function originalUpload($data){
+    public function originalUpload($param){
         $arr = array();
-        $arr['data'] = $data['data'];
-        $arr['time'] = $data['time'];
+        if(!empty($param->data)){
+          $data = $param->data;        
+        }
+        else{
+          $data = $param->data_1;
+        }
+
+        $arr['data'] = $data;
+        $arr['time'] = $param->time;
+        $arr['user_id'] = $param->user_id;
         $arr['create_time'] = date('Y-m-d H:i:s');   
-        $this->data_original_model->add($arr);
-        return true;
+        if($this->data_original_model->add($arr))
+            return true;
+        else
+            return false;
     }
 
 

--
Gitblit v1.8.0