Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/scx_api' into 'master'

Browse Source 
* Fix api bug.

See merge request easycorp/zentaopms!4628
This commit is contained in:
朱金勇
2022-07-22 02:35:20 +00:00
parent 815c633bc7 99f4bb5877
commit 5ff47f2bd4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/productplans.php
+1 -1
View File
@@ -24,7 +24,7 @@ class productplansEntry extends entry
if(!$productID) return $this->sendError(400, 'No product id.');
$control = $this->loadController('productplan', 'browse');
$control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'), $this->param('order', 'begin_desc'), 0, $this->param('limit', 20), $this->param('page', 1));
$control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'), $this->param('query', 0), $this->param('order', 'begin_desc'), 0, $this->param('limit', 20), $this->param('page', 1));
/* Response */
$data = $this->getData();
framework/api/entry.class.php
+1 -1
View File
@@ -535,7 +535,7 @@ class baseEntry
/* Format array. */
$value = array();
if(is_array($object->$key))
if(is_array($object->$key) or is_object($object->$key))
{
foreach($object->$key as $v) $value[] = $this->cast($v, $type);
}