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

* adjust for users api.

Browse Source
This commit is contained in:
王怡栋
2021-10-29 14:01:52 +08:00
parent a89fb80abc
commit c295854d26
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/user.php
+1 -1
View File
@@ -242,7 +242,7 @@ class userEntry extends Entry
if(!empty($this->config->maxVersion))
{
$control = $this->loadController('my', 'myMeeting');
$control->myMeeting('futureMeeting', 'id_desc', 0, $this->param('limit', 5), 1);
$control->myMeeting('all', 'id_desc', 0, $this->param('limit', 5), 1);
$data = $this->getData();
if($data->status == 'success')
api/v1/entries/users.php
+22 -12
View File
@@ -9,7 +9,7 @@
* @version 1
* @link http://www.zentao.net
*/
class usersEntry extends entry
class usersEntry extends entry
{
/**
* GET method.
@@ -19,22 +19,32 @@ class usersEntry extends entry
*/
public function get()
{
$control = $this->loadController('company', 'browse');
$control->browse('inside', 0, $this->param('type', 'bydept'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(!common::hasPriv('company', 'browse')) return $this->sendError(400, 'error: no company-browse priv.');
if(isset($data->status) and $data->status == 'success')
$appendFields = $this->param('fileds', '');
$type = $this->param('type', 'bydept');
$limit = (int)$this->param('limit', 20);
$pager = null;
if($limit)
{
$users = $data->data->users;
$pager = $data->data->pager;
$result = array();
foreach($users as $user) $result[] = $this->format($user, 'locked:time');
return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'users' => $result));
$this->app->loadClass('pager', $static = true);
$pager = pager::init(0, $limit, $this->param('page', 1));
}
if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
$users = $this->loadModel('company')->getUsers($this->param('browse', 'inside'), $type, 0, 0, $this->param('order', 'id_desc'), $pager);
$result = array();
foreach($users as $user)
{
$user = $this->filterFields($user, 'id,dept,account,realname,role,pinyin,email,' . $appendFields);
$result[] = $this->format($user, 'locked:time');
}
return $this->sendError(400, 'error');
$pageID = $pager ? $pager->pageID : 1;
$total = $pager ? $pager->recTotal : count($result);
$limit = $pager ? $pager->recPerPage : $total;
return $this->send(200, array('page' => $pageID, 'total' => $total, 'limit' => $limit, 'users' => $result));
}
/**