Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Party.php

@@ -123,6 +123,7 @@ class Party extends Common
                     $party_notice = $guild['desc'];
                     $party_notice_detail = $guild['notice'];
                 }
+                $party_type = 7;
             }
             $data = [];
             $data["user_id"] = $this->auth->id;

application/api/controller/User.php

@@ -929,6 +929,12 @@ class User extends Api
             if (empty($idCard)) {
                 throw new Exception('请输入身份证号');
             }
+            $userAuthWhere['user_id'] = ['neq',$this->auth->id];
+            $userAuthWhere['idcard'] = $idCard;
+            $userAuth = model('UserAuth')->where($userAuthWhere)->find();
+            if (!empty($userAuth)) {
+                throw new Exception('该身份证号已被其他用户实名验证过');
+            }
             /*$userService = new UserService();
             $faceParams = [
                 'real_name' => $realName,