sprint_59471

module/dept/model.php

@@ -113,7 +113,7 @@ class deptModel extends model
         krsort($deptMenu);
         $topMenu = array_pop($deptMenu);
         $topMenu = explode("\n", trim((string)$topMenu));
-        $lastMenu[] = '/';
+        $lastMenu[] = '/无部门';
         foreach($topMenu as $menu)
         {
             if(!strpos($menu, '|')) continue;

module/report/control.php

@@ -315,7 +315,14 @@ class report extends control
         $users[''] = $this->lang->report->annualData->allUser;
 
         $depts = $this->loadModel('dept')->getOptionMenu();
-        $depts = array('' => $this->lang->report->annualData->allDept) + $depts;
+        if(!$this->app->user->admin)
+        {
+            foreach($depts as $id => $name) if($id != $this->app->user->dept) unset($depts[$id]);
+        }
+        else
+        {
+            $depts = array('' => $this->lang->report->annualData->allDept) + $depts;
+        }
         if(empty($userID)) unset($depts[0]);
 
         $accounts = array();