From de58643be7b87cb52076db10b399eca94eeb8f72 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 6 Jul 2022 14:33:20 +0000
Subject: [PATCH] fixbug

---
 module/dept/model.php     |  1 +
 module/report/control.php | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/module/dept/model.php b/module/dept/model.php
index fb9cf45819..8349d58a4b 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -409,6 +409,7 @@ class deptModel extends model
             ->where('deleted')->eq(0)
             ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
             ->beginIF($childDepts)->andWhere('dept')->in($childDepts)->fi()
+            ->beginIF($deptID === '0')->andWhere('dept')->eq($deptID)->fi()
             ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
             ->orderBy('account')
             ->fetchPairs();
diff --git a/module/report/control.php b/module/report/control.php
index 60e3ff54e9..6b6c486d71 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -315,6 +315,21 @@ class report extends control
         $users[''] = $this->lang->report->annualData->allUser;
 
         $depts = $this->loadModel('dept')->getOptionMenu();
+        $accounts = array();
+        if($userID)
+        {
+            $user     = $this->loadModel('user')->getById($userID, 'id');
+            $dept     = $user->dept;
+            $users    = $this->loadModel('dept')->getDeptUserPairs($dept, 'id');
+            $accounts = array($user->account => ($user->realname ? $user->realname : $user->account));
+        }
+        else
+        {
+            $users    = $this->loadModel('dept')->getDeptUserPairs($dept, 'id');
+            $users    = array('' => $this->lang->report->annualData->allUser) + $users;
+            $accounts = $this->loadModel('dept')->getDeptUserPairs($dept);
+        }
+a($this->app->user->account);
         if(!$this->app->user->admin)
         {
             foreach($depts as $id => $name) if($id != $this->app->user->dept) unset($depts[$id]);
@@ -323,25 +338,9 @@ class report extends control
         {
             $depts = array('' => $this->lang->report->annualData->allDept) + $depts;
         }
-        if(empty($userID)) unset($depts[0]);
 
-        $accounts = array();
-        if($dept) $accounts = $this->loadModel('dept')->getDeptUserPairs($dept);
-        if($userID)
-        {
-            $user = $this->loadModel('user')->getById($userID, 'id');
-            $dept = $user->dept;
-            $accounts = array($user->account => ($user->realname ? $user->realname : $user->account));
-        }
-        if(empty($accounts)) $accounts = $this->user->getPairs('noletter|noclosed');
         if($accounts) $accounts = array_keys($accounts);
 
-        if($dept)
-        {
-            $users = $this->loadModel('dept')->getDeptUserPairs($dept, 'id');
-            $users = array('' => $this->lang->report->annualData->allUser) + $users;
-        }
-
         /* Get annual data. */
         $data = array();
         if(!$userID)