工会微调整

application/api/controller/Guild.php

@@ -606,7 +606,7 @@ class Guild extends Api
         $guildMemberCount = \app\common\model\GuildMember::alias("a")->where($where)->count("id");
         // 获取公会成员列表
         $guildMemberList = \app\common\model\GuildMember::alias("a")
-            ->field("a.id,u.avatar,u.nickname,u.gender,u.age,a.role,u.is_online,u.onlinetime")
+            ->field("a.id,a.user_id,u.avatar,u.nickname,u.gender,u.age,a.role,u.is_online,u.onlinetime")
             ->join("hx_user u","a.user_id = u.id")
             ->where($where)
             ->limit($pageStart,$pageNum)
@@ -703,17 +703,23 @@ class Guild extends Api
      */
     public function guildSetManage() {
         $guild_id = input("guild_id",0,"intval"); //公会ID
-        $member_user_id = input("member_user_id",0,"intval"); //成员用户ID
+        $member_id = input("member_id",0,"intval"); //成员ID
         $type = input("type",1); // 设置类型:1=设为管理员,2=取消管理员
-        if(!$guild_id || !$member_user_id || !in_array($type,[1,2])) $this->error("参数缺失！");
-        // 先判断是否为公会会长
+
+        if(!$guild_id || !$member_id || !in_array($type,[1,2])) $this->error("参数缺失！");
+
         $user_id = $this->auth->id;
+
         // 获取公会信息
         $guildInfo = \app\common\model\Guild::where(["id"=>$guild_id])->find();
+
         // 验证更新条件
         if($user_id !== $guildInfo->user_id) $this->error("身份验证失败！您不是公会长，无权限更改！");
-        $memberInfo = \app\common\model\GuildMember::where(["user_id"=>$member_user_id])->find();
+
+        $memberInfo = \app\common\model\GuildMember::where(["id"=>$member_id,'guild_id'=>$guild_id])->find();
         if(!$memberInfo) $this->error("会员信息查询失败！");
+
+        //取消管理员
         if($type == 2) {
             $memberInfo->role = 0;
             $memberInfo->updatetime = time();
@@ -725,6 +731,7 @@ class Guild extends Api
             }
         }
 
+        //设置管理员
         $memberInfo->role = 1;
         $memberInfo->updatetime = time();
         $res = $memberInfo->save();
@@ -742,7 +749,7 @@ class Guild extends Api
                 $redis->select($redisconfig['redis_selectdb']);
             }
             // 获取成员用户信息
-            $memberuserInfo = \app\common\model\User::field("id,avatar,nickname,gender,level")->find($member_user_id);
+            $memberuserInfo = \app\common\model\User::field("id,avatar,nickname,gender,level")->where('id',$memberInfo['user_id'])->find();
             $data = [];
             $data["user_id"] = $memberuserInfo->id;
             $data["avatar"] = $memberuserInfo->avatar;
@@ -756,8 +763,8 @@ class Guild extends Api
             $redis->hSet("party_manage_".$party_id,$memberuserInfo->id."-1",serialize($data));
 
             // 腾讯im设置管理员
-            $tenim = new Tenim();
-            $tenim->setImManage($member_user_id,$party_id);
+//            $tenim = new Tenim();
+//            $tenim->setImManage($memberInfo['user_id'],$party_id);
 
             $this->success("设置成功！");
         } else {
@@ -828,7 +835,7 @@ class Guild extends Api
                     ->autopage()
                     ->select();
                 if (!empty($list)) {
-                    $role = [0=>'成员',1=>'副族长',2=>'族长'];
+                    $role = [0=>'成员',1=>'副会长',2=>'会长'];
                     $guildMemberData = [];
                     foreach ($guildMember as $mKey => $mVal) {
                         $guildMemberData[$mVal['user_id']] = [