|
@@ -124,7 +124,9 @@ class Guild extends Api
|
|
if($idcardfind) $this->error("您存在加入公会的申请,正在审核中,请耐心等待!");
|
|
if($idcardfind) $this->error("您存在加入公会的申请,正在审核中,请耐心等待!");
|
|
|
|
|
|
$memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id])->find();
|
|
$memberfind = \app\common\model\GuildMember::where(["user_id"=>$user_id])->find();
|
|
- if($memberfind) $guild_id = $memberfind->guild_id;
|
|
|
|
|
|
+ if($memberfind) {
|
|
|
|
+ $guild_id = $memberfind->guild_id;
|
|
|
|
+ }
|
|
|
|
|
|
$guildWhere['user_id'] = $user_id;
|
|
$guildWhere['user_id'] = $user_id;
|
|
$guildWhere['status'] = ['in',[0,1]];
|
|
$guildWhere['status'] = ['in',[0,1]];
|
|
@@ -148,7 +150,8 @@ class Guild extends Api
|
|
->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
|
|
->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
|
|
->join("hx_user u","a.user_id = u.id")
|
|
->join("hx_user u","a.user_id = u.id")
|
|
->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
|
|
->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
|
|
- if(!$guildInfo || !$guildMemberInfo) $this->error("公会信息获取失败!");
|
|
|
|
|
|
+
|
|
|
|
+ if(!$guildInfo) $this->error("公会信息获取失败!");
|
|
|
|
|
|
// 获取公会成员总数
|
|
// 获取公会成员总数
|
|
$guildMemberCount = \app\common\model\GuildMember::where(["guild_id"=>$guild_id])->count("id");
|
|
$guildMemberCount = \app\common\model\GuildMember::where(["guild_id"=>$guild_id])->count("id");
|