家族成员，后台审核

application/admin/controller/Familymember.php

@@ -82,19 +82,28 @@ class Familymember extends Backend
             ->where('id',$id)
             ->find();
 
+        // 获取公会信息
+        $guildInfo = \app\common\model\Family::where(["id"=>$info['guild_id']])->find();
+
         if ($this->request->isPost()) {
             $status = input('status',0);
-            $data = [
-                'status' => $status,
-                /*'auditremark' => input('auditremark',''),
-                'audittime' => strtotime(input('audittime','')),
-                'updatetime' => time(),*/
-            ];
+
             Db::startTrans();
-            $rs = Db::name('family_member')->where('id',$id)->update($data);
+
 
             if($status == 1){
 
+                //判断重复
+                $memberfind = \app\common\model\Family::where(["user_id"=>$info['user_id'],"status"=>['IN',[0,1]] ])->find();
+                if($memberfind) {
+                    Db::rollback();
+                    $this->error("该用户已申请了自己的家族！");
+                }
+
+                //[环信]把用户加到群组里
+                $easemob = new Easemob();
+                $easemob->group_addGroupMember($guildInfo['easemob_group_id'],$info['user_id']);
+
                 $res4 = \app\common\model\Family::where(["id"=>$info['guild_id']])->setInc("member");
 
                 //系统消息
@@ -105,6 +114,12 @@ class Familymember extends Backend
                 $msg_id = \app\common\model\Message::addMessage($info['user_id'],'家族审核','家族审核已经被拒绝');
             }
 
+            $data = [
+                'status' => $status,
+                'updatetime' => time(),
+            ];
+            $rs = Db::name('family_member')->where('id',$id)->update($data);
+
             Db::commit();
 
             $this->success('审核完成');

application/api/controller/Family.php

@@ -347,8 +347,12 @@ class Family extends Api
         if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是族长，无权限！");
 
         //判断重复
-        $memberfind = \app\common\model\Family::where(["user_id"=>$memberInfo['user_id'],"status"=>['IN',[0,1]] ])->find();
-        if($memberfind) $this->error("该用户已申请了自己的家族！");
+        if($is_pass == 1){
+            $memberfind = \app\common\model\Family::where(["user_id"=>$memberInfo['user_id'],"status"=>['IN',[0,1]] ])->find();
+            if($memberfind) {
+                $this->error("该用户已申请了自己的家族！");
+            }
+        }
 
         Db::startTrans();
         try{

public/assets/js/backend/family.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'family/index' + location.search,
                     add_url: 'family/add',
                     edit_url: 'family/edit',
-                    del_url: 'family/del',
+//                    del_url: 'family/del',
                     multi_url: 'family/multi',
                     import_url: 'family/import',
                     table: 'family',