From 47e5316450f7487ff62c0ae9333d070d59d2b397 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 29 Mar 2018 15:20:31 +0800
Subject: [PATCH] 修正时间判断
---
Yfs/Api/Data.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 4fdbede..36c1ee3 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -57,15 +57,14 @@
public function getUserDataList(){
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$data_daily_service = new Domain_DataDaily();
- if($data_daily_service->checkTime($this->start_time, $this->end_time)){
+ if($this->start_time == $this->end_time || $data_daily_service->checkTime($this->start_time, $this->end_time)){
$result = $data_daily_service->getUserDataList($this->user_id, $this->start_time, $this->end_time);
if($result){
$rs['msg'] = '������������������';
$rs['info'] = $result;
}
else{
- $rs['code'] = 1;
- $rs['msg'] = '������������������';
+ $rs['msg'] = '������������';
}
}
else{
--
Gitblit v1.8.0