diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 408d5c3..5da0317 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -139,7 +139,7 @@ class User extends Controller {
      * 
      * @param name:pageIndex type:int require:1 desc:当前页码数
      * @param name:pageSize type:int require:1 desc:单页数据条数
-     * @param type:username type:string require:1 desc:用户名或邮箱
+     * @param name:username type:string require:1 desc:用户名或邮箱
      * 
      * @return users:用户列表#
      * @return count:总数
@@ -147,14 +147,15 @@ class User extends Controller {
     public function getAllUser() {
         $data = $this->request->post();
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
+        $black_list = $this->user_black_obj->where('black_state',0)->column("user_id");
         $frag = [];
         $count = 0;
         if ($data['username'] == "") {
-            $frag = $this->user_obj->where('state', 0)->limit($limit_start, $data['pageSize'])->select();
-            $count = $this->user_obj->where('state', 0)->count();
+            $frag = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->limit($limit_start, $data['pageSize'])->select();
+            $count = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->count();
         } else {
-            $frag = $this->user_obj->where('state', 0)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->limit($limit_start, $data['pageSize'])->select();
-            $count = $this->user_obj->where('state', 0)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->count();
+            $frag = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->limit($limit_start, $data['pageSize'])->select();
+            $count = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->count();
         }
         $re['users'] = $frag;
         $re['count'] = $count;
@@ -174,6 +175,10 @@ class User extends Controller {
      */
     public function pushUserToBlack() {
         $data = $this->request->post();
+        $check_black = $this->user_black_obj->where('user_id',$data['user_id'])->where('black_state',0)->find();
+        if($check_black){
+            return jsonError("repeat !");
+        }
         $insert['user_id'] = $data['user_id'];
         $insert['reason'] = trim($data['reason']);
         $insert['black_ctime'] = time();
@@ -198,7 +203,7 @@ class User extends Controller {
         $data = $this->request->post();
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
         $list = $this->user_black_obj
-                        ->field("t_user.account,t_user.email,t_user_black.*")
+                        ->field("t_user.account,t_user.email,t_user.realname,t_user_black.*")
                         ->join('t_user', 't_user.user_id = t_user_black.user_id', 'left')
                         ->where('t_user_black.black_state', 0)
                         ->limit($limit_start, $data['pageSize'])->select();
@@ -518,7 +523,7 @@ class User extends Controller {
         $url = config('base_web_url') . 'retrieveact?actkey=' . $act_insert['act_key'];
         $title = 'Your request to reset your password [TMR Publishing Group]';
         $content = "$realname, we've received your request to reset your password.Please click the link below to change your password. <a href='$url' target='_blank'>$url</a>";
-        $res = sendEmail($email, $title, 'TMR', $content,);
+        $res = sendEmail($email, $title, 'TMR', $content);
         if ($res['status'] == 1) {//成功
             return json(['code' => 0, 'msg' => 'success']);
         } else {//失败