* fix issue on show avatar.

This commit is contained in:
Hao Sun
2022-04-20 11:31:36 +08:00
parent 6c46a39ca1
commit 6dc60ceead
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -259,7 +259,7 @@ class html extends baseHTML
}
elseif(is_object($user))
{
$userObj->avatar = $user->avatar;
$userObj->avatar = isset($user->avatar) ? $user->avatar : '';
$userObj->account = $user->account;
$userObj->name = isset($user->name) ? $user->name : (isset($user->realname) ? $user->realname : $user->account);
$user = $userObj;
+1 -1
View File
@@ -228,7 +228,7 @@ class userModel extends model
{
$users = $this->dao->select('account, realname, avatar, dept, role')->from(TABLE_USER)
->where('deleted')->eq(0)
->beginIF($accounts)->andWhere('type')->eq($type)->fi()
->beginIF($type)->andWhere('type')->eq($type)->fi()
->beginIF($accounts)->andWhere('account')->in($accounts)->fi()
->fetchAll('account');