From 48ba3c94c6b5a6c38f0bb8ca29e3d8e2edffdb56 Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Fri, 2 Aug 2013 08:45:29 +0800
Subject: [PATCH]  * adjust code for task #1660.

---
 module/dept/control.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/dept/control.php b/module/dept/control.php
index ac16bfd809..93796a109f 100644
--- a/module/dept/control.php
+++ b/module/dept/control.php
@@ -84,13 +84,14 @@ class dept extends control
      */
     public function delete($deptID, $confirm = 'no')
     {
+        /* Check this dept when delete. */
+        $sons  = $this->dept->getSons($deptID);
+        $users = $this->dept->getUsers($deptID);
+        if($sons)  die(js::alert($this->lang->dept->error->hasSons));
+        if($users) die(js::alert($this->lang->dept->error->hasUsers));
+
         if($confirm == 'no')
         {
-            $sons  = $this->dept->getSons($deptID);
-            $users = $this->dept->getUsers($deptID);
-            if($sons)  die(js::alert($this->lang->dept->error->hasSons));
-            if($users) die(js::alert($this->lang->dept->error->hasUsers));
-
             die(js::confirm($this->lang->dept->confirmDelete, $this->createLink('dept', 'delete', "deptID=$deptID&confirm=yes")));
         }
         else