elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
master
liuweiwen 5 years ago
parent 1f23955af1 b82803c1e5
commit 914c9a5cf8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -1639,7 +1639,7 @@ class DownloadController extends BaseController {
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]]; $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
} }
if(!empty($begtime) && !empty($endtime)) { if(!empty($begtime) && !empty($endtime)) {
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]]; $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]];
} }
$serverField = ''; $serverField = '';
$serverJoin = ''; $serverJoin = '';
@ -1871,12 +1871,12 @@ class DownloadController extends BaseController {
$begTime = strtotime($initBegTime); $begTime = strtotime($initBegTime);
$endTime = strtotime($initEndTime); $endTime = strtotime($initEndTime);
$params['begin_time'] = $begTime; $params['begin_time'] = $begTime;
$params['end_time'] = $endTime +3600 * 24 -1; $params['end_time'] = $endTime -1;
if(!empty($map['apply_time'][1])) { if(!empty($map['apply_time'][1])) {
$begTime = $map['apply_time'][1][0]; $begTime = $map['apply_time'][1][0];
$endTime = $map['apply_time'][1][1]; $endTime = $map['apply_time'][1][1];
$params['begin_time'] = $begTime; $params['begin_time'] = $begTime;
$params['end_time'] = $endTime + 3600 * 24 -1; $params['end_time'] = $endTime -1;
unset($map['apply_time']); unset($map['apply_time']);
} }
if(!empty($map['tab_server.server_id'])) { if(!empty($map['tab_server.server_id'])) {

Write Preview
Loading…
Cancel
Save