工会微调整

application/api/controller/Guild.php

@@ -677,8 +677,9 @@ class Guild extends Api
      */
     public function guildDelMember() {
         $guild_id = input("guild_id",0,"intval"); //公会ID
-        $member_user_id = input("member_user_id",0,"intval"); //成员用户ID
-        if(!$guild_id || !$member_user_id) $this->error("参数缺失！");
+        $member_id = input("member_id",0,"intval"); //成员ID
+        if(!$guild_id || !$member_id) $this->error("参数缺失！");
+
         // 先判断是否为公会会长
         $user_id = $this->auth->id;
         // 获取公会信息
@@ -686,8 +687,13 @@ class Guild extends Api
         // 验证更新条件
         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($memberInfo['role'] == 2 || $memberInfo['user_id'] == $guildInfo['user_id']){
+            $this->error('会长不能被踢出工会');
+        }
+
         Db::startTrans();
         try{
             $res1 = $memberInfo->delete();