家族和公会的审核修改

application/api/controller/Family.php

@@ -351,45 +351,44 @@ class Family extends Api
      * 公会申请加入列表
      */
     public function guildauditList() {
-        try {
-            $user_id = $this->auth->id;
-            // 获取公会信息
-            $guildInfo = model('Family')->where(["user_id"=>$user_id])->find();
-            if(!$guildInfo) throw new Exception('您当前还没有家族！');
-
-            // 先获取申请列表
-            $where = [];
-            $where["m.guild_id"] = $guildInfo->id;
-            $where["m.status"] = 0;
-            $result = Db::name('family_member')->alias('m')
-                ->field("m.*,user.is_online,user.onlinetime,user.nickname,user.avatar")
-                ->join('user','m.user_id = user.id','LEFT')
-                ->join('family','m.guild_id = family.id','LEFT')
-                ->where($where)->order("createtime","desc")->select();
-            $result = list_domain_image($result,['avatar']);
-
-            if($result) {
-                foreach($result as $k => &$v) {
-
-                    if ($v['is_online'] == 1) {
-                        $onlineText = '在线';
-                    } else {
-                        $onlineTime = get_last_time($v['onlinetime']);
-                        $onlineText = $onlineTime.'在线';
-                        $limitTime = time() - (3600 * 6);
-                        if ($v['onlinetime'] < $limitTime) {
-                            $onlineText = '离线';
-                        }
-                    }
 
-                    $v['online_text'] = $onlineText;
-                    unset($v['user']);
+        $user_id = $this->auth->id;
+        // 获取公会信息
+        $guildInfo = model('Family')->where(["user_id"=>$user_id])->find();
+        if(!$guildInfo) {
+            $this->success("获取成功",[]);
+        }
+
+        // 先获取申请列表
+        $where = [];
+        $where["m.guild_id"] = $guildInfo->id;
+        $where["m.status"] = 0;
+        $result = Db::name('family_member')->alias('m')
+            ->field("m.id,m.user_id,m.createtime,user.is_online,user.onlinetime,user.nickname,user.avatar")
+            ->join('user','m.user_id = user.id','LEFT')
+            ->where($where)->order("m.id","asc")->select();
+        $result = list_domain_image($result,['avatar']);
+
+        if($result) {
+            foreach($result as $k => &$v) {
+
+                if ($v['is_online'] == 1) {
+                    $onlineText = '在线';
+                } else {
+                    $onlineTime = get_last_time($v['onlinetime']);
+                    $onlineText = $onlineTime.'在线';
+                    $limitTime = time() - (3600 * 6);
+                    if ($v['onlinetime'] < $limitTime) {
+                        $onlineText = '离线';
+                    }
                 }
+
+                $v['online_text'] = $onlineText;
+                unset($v['user']);
             }
-            $this->success("获取成功",$result);
-        } catch (Exception $e) {
-            $this->error($e->getMessage());
         }
+        $this->success("获取成功",$result);
+
     }
 
     /**

application/api/controller/Guild.php

@@ -439,45 +439,43 @@ class Guild extends Api
      * 公会申请加入列表
      */
     public function guildJoinList() {
-        try {
-            $user_id = $this->auth->id;
-            // 获取公会信息
-            $guildInfo = model('Guild')->where(["user_id"=>$user_id])->find();
-            if(!$guildInfo) throw new Exception('公会信息获取失败！');
-            // 先获取申请列表
-            $where = [];
-            $where["guild_id"] = $guildInfo->id;
-            $where["status"] = 0;
-            $result = model('GuildJoinin')->field("id,user_id,user_avatar,user_nickname,guild_name,createtime")
-                ->with(['user'=>function($uQuery){
-                    $uQuery->field('id,is_online,onlinetime');
-                }])
-                ->where($where)->order("createtime","desc")->select();
-            if($result) {
-                foreach($result as $k => &$v) {
-                    $user = isset($v['user']) ? $v['user'] : [];
-                    $onlineText = '';
-                    if (!empty($user)) {
-                        if ($user['is_online'] == 1) {
-                            $onlineText = '在线';
-                        } else {
-                            $onlineTime = get_last_time($user['onlinetime']);
-                            $onlineText = $onlineTime.'在线';
-                            $limitTime = time() - (3600 * 6);
-                            if ($user['onlinetime'] < $limitTime) {
-                                $onlineText = '离线';
-                            }
-                        }
+
+        $user_id = $this->auth->id;
+        // 获取公会信息
+        $guildInfo = model('Guild')->where(["user_id"=>$user_id])->find();
+        if(!$guildInfo) {
+            $this->success("获取成功",[]);
+        }
+
+        // 先获取申请列表
+        $where = [];
+        $where["m.guild_id"] = $guildInfo->id;
+        $where["m.status"] = 0;
+        $result = Db::name('guild_joinin')->alias('m')
+            ->field("m.id,m.user_id,m.createtime,user.is_online,user.onlinetime,user.nickname,user.avatar")
+            ->join('user','m.user_id = user.id','LEFT')
+            ->where($where)->order("createtime","desc")->select();
+        if($result) {
+            foreach($result as $k => &$v) {
+
+                if ($v['is_online'] == 1) {
+                    $onlineText = '在线';
+                } else {
+                    $onlineTime = get_last_time($v['onlinetime']);
+                    $onlineText = $onlineTime.'在线';
+                    $limitTime = time() - (3600 * 6);
+                    if ($v['onlinetime'] < $limitTime) {
+                        $onlineText = '离线';
                     }
-                    $v['online_text'] = $onlineText;
-                    $v['createtime'] = !empty($v["createtime"]) ? date("Y-m-d H:i", $v["createtime"]) : '';
-                    unset($v['user']);
                 }
+
+                $v['online_text'] = $onlineText;
+                unset($v['user']);
             }
-            $this->success("获取成功",$result);
-        } catch (Exception $e) {
-            $this->error($e->getMessage());
         }
+        $this->success("获取成功",$result);
+        $this->success("获取成功",$result);
+
     }
 
     /**