diff --git a/lib/dingapi/dingapi.class.php b/lib/dingapi/dingapi.class.php
index 454491b40b..eb6824ab72 100644
--- a/lib/dingapi/dingapi.class.php
+++ b/lib/dingapi/dingapi.class.php
@@ -85,8 +85,47 @@ class dingapi
         $response = $this->queryAPI($this->apiUrl . "department/list?access_token={$this->token}");
         if($this->isError()) return false;
 
+        $whiteList = array();
+        if($whiteList)
+        {
+            $parentIdList    = array();
+            $whiteListParent = array();
+            foreach($response->department as $dept)
+            {
+                if(!empty($dept->parentid)) $parentIdList[$dept->id] = $dept->parentid;
+                if(in_array($dept->name, $whiteList)) $whiteListParent[$dept->id] = $dept->id;
+            }
+        }
+
         $deptPairs = array();
-        foreach($response->department as $dept) $deptPairs[$dept->id] = $dept->name;
+        foreach($response->department as $dept)
+        {
+            if($whiteList)
+            {
+                if(empty($dept->parentid)) continue;
+                if(isset($whiteListParent[$dept->id]))
+                {
+                    $deptPairs[$dept->id] = $dept->name;
+                    continue;
+                }
+
+                $isWhiteList = false;
+                $parentID    = $dept->parentid;
+                while(isset($parentIdList[$parentID]))
+                {
+                    if(isset($whiteListParent[$parentID]))
+                    {
+                        $isWhiteList = true;
+                        break;
+                    }
+
+                    $parentID = $parentIdList[$parentID];
+                }
+                if(!$isWhiteList) continue;
+            }
+
+            $deptPairs[$dept->id] = $dept->name;
+        }
         return $deptPairs;
     }
 
diff --git a/module/webhook/view/bind.html.php b/module/webhook/view/bind.html.php
index 346fb2d075..c79effe4e5 100644
--- a/module/webhook/view/bind.html.php
+++ b/module/webhook/view/bind.html.php
@@ -33,7 +33,7 @@
           }
           ?>
           <td colspan="2">
-            <?php echo '<span class="label label-badge label-primary label-outline">' . $useridPairs[$userid] . '</span>';?>
+            <?php echo '<span class="label label-badge label-primary label-outline">' . zget($useridPairs, $userid) . '</span>';?>
             <?php echo html::input("userid[{$user->account}]", $userid, 'class="form-control hidden"');?>
           </td>
           <td class='text-center c-actions'><?php echo '<button class="btn bind" type="button" data-value="userid[' . $user->account . ']"><i class="icon-common-edit icon-edit"></i></button>';?></td>