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

* Fix bug#21383.

Browse Source
This commit is contained in:
xieqiyu
2022-04-01 14:40:38 +08:00
parent 38e5c5d2f5
commit 638d4bd8b8
3 changed files with 3 additions and 3 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/tree/model.php
+1 -1
View File
@@ -176,7 +176,7 @@ class treeModel extends model
ksort($treeMenu);
$topMenu = @array_shift($treeMenu);
$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]));