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

Merge branch 'master_xieqiyu_21383' into 'master'

Browse Source 
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
This commit is contained in:
孙广明
2022-04-02 02:19:05 +00:00
parent 3e8175b22e 638d4bd8b8
commit 3718a90a21
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dept/model.php
+1 -1
View File
@@ -112,7 +112,7 @@ class deptModel extends model
krsort($deptMenu);
$topMenu = array_pop($deptMenu);
$topMenu = explode("\n", trim($topMenu));
$topMenu = explode("\n", trim((string)$topMenu));
$lastMenu[] = '/';
foreach($topMenu as $menu)
{
module/user/model.php
+1 -1
View File
@@ -424,7 +424,7 @@ class userModel extends model
$data[$i]->type = 'inside';
$data[$i]->realname = $users->realname[$i];
$data[$i]->role = $role;
$data[$i]->group = in_array('ditto', $users->group[$i]) ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i];
$data[$i]->group = in_array('ditto', isset($users->group[$i]) ? $users->group[$i] : array()) ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i];
$data[$i]->email = $users->email[$i];
$data[$i]->gender = $users->gender[$i];
$data[$i]->password = md5(trim($users->password[$i]));