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

* adjust for user getById.

Browse Source
This commit is contained in:
wangyidong
2015-11-26 09:20:53 +08:00
parent a94cd23f69
commit 6670b94caf
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/user/model.php
View File

@@ -165,10 +165,9 @@ class userModel extends model
* @access public
* @return object|bool
*/
public function getById($userID)
public function getById($userID, $field = 'account')
{
$user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($userID)->fetch();
if(!$user) $user = $this->dao->select('*')->from(TABLE_USER)->where('id')->eq($userID)->fetch();
$user = $this->dao->select('*')->from(TABLE_USER)->where($field)->eq($userID)->fetch();
if(!$user) return false;
$user->last = date(DT_DATETIME1, $user->last);
return $user;
@@ -324,7 +323,7 @@ class userModel extends model
{
if(!$this->checkPassword(true)) return;
$oldUser = $this->getById($userID);
$oldUser = $this->getById($userID, 'id');
$userID = $oldUser->id;
$user = fixer::input('post')