工会微调整

application/api/controller/Guild.php

@@ -20,10 +20,36 @@ class Guild extends Api
     protected $noNeedRight = ['*'];
 
     /**
+     * 获取搜索公会列表
+     */
+    public function getGuildList() {
+        $search = input("search","","string"); //搜索的字段 公会名称/公会ID
+        $where = [];$whereOr = [];
+        $where['status'] = 1;
+        if (!empty($search)) {
+            $whereOr['name'] = array('like', '%' . $search . '%');
+            $whereOr['g_id'] = $search;
+        }
+        $res = Db::name('guild')->field("id,g_id,user_id,party_id,name,image,desc,member")
+            ->where($where)
+            ->where(function ($query) use($whereOr) {
+                $query->whereOr($whereOr);
+            })
+            ->autopage()
+            ->select();
+        $res = list_domain_image($res,['image']);
+
+        $this->success("获取成功！",$res);
+    }
+
+
+    ///////////////没用到的///////////
+
+    /**
      * 获取公会信息
      */
     public function getGuildInfo() {
-        $guild_id = $this->request->request("guild_id"); //公会ID
+        $guild_id = input("guild_id"); //公会ID
         $is_member = 0;
         if($guild_id <= 0) {
             $is_member = 1;
@@ -41,25 +67,34 @@ class Guild extends Api
             }
 
         }
+
+        //结果
         $res = [];
+        //公会信息
         $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice")->where(["id"=>$guild_id])->find();
+
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
-            ->field("a.user_id,a.role,u.nickname,u.avatar,u.gender,u.age")
+            ->field("a.user_id,a.role,u.nickname,u.avatar,u.gender")
             ->join("hx_user u","a.user_id = u.id")
-            ->where(["a.guild_id"=>$guild_id])->limit(5)->order("a.role","desc")->select();
+            ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
         if(!$guildInfo || !$guildMemberInfo) $this->error("公会信息获取失败！");
+
         // 获取公会成员总数
         $guildMemberCount = \app\common\model\GuildMember::where(["guild_id"=>$guild_id])->count("id");
+
         // 获取会长信息
         $guilderInfo = \app\common\model\User::field("avatar,nickname,u_id")->where(["id"=>$guildInfo->user_id])->find();
+
         // 获取房间信息
         $partyInfo = \app\common\model\Party::field("party_logo,party_type,is_online,party_name,party_notice_detail")->where(["id"=>$guildInfo->party_id])->find();
+
         // 派对类型
         $partyTypeName = "普通房";
         if($partyInfo["party_type"]) {
             $partyTypeName = \app\common\model\PartyType::where(["id"=>$partyInfo["party_type"]])->value("name");
         }
+
         $mod = isset($partyInfo["party_type"])?intval($partyInfo["party_type"])%5:1;
         $partyInfo["party_type_color"] = $mod == 0?5:$mod;
         $partyInfo["type_name"] = $partyTypeName;
@@ -78,7 +113,7 @@ class Guild extends Api
      * 获取公会信息-新
      */
     public function getGuildInfoNew() {
-        $guild_id = $this->request->request("guild_id"); //公会ID
+        $guild_id = input("guild_id"); //公会ID
         $is_member = 0;
         $user_id = $this->auth->id;
         if($guild_id <= 0) {
@@ -98,6 +133,7 @@ class Guild extends Api
                 $this->success("获取成功！",$res);
             }
         }
+
         $res = [];
         $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where(["id"=>$guild_id])->find();
         // 获取公会成员信息
@@ -155,11 +191,11 @@ class Guild extends Api
     public function guildSaveInfo() {
         Db::startTrans();
         try {
-            $guild_id = $this->request->request("guild_id"); //公会id
-            $guild_name = $this->request->request("guild_name"); //公会简介
-            $guild_image = $this->request->request("guild_image"); //公会简介
-            $guild_desc = $this->request->request("guild_desc"); //公会简介
-            $guild_notice = $this->request->request("guild_notice"); //公会公告
+            $guild_id = input("guild_id"); //公会id
+            $guild_name = input("guild_name"); //公会简介
+            $guild_image = input("guild_image"); //公会简介
+            $guild_desc = input("guild_desc"); //公会简介
+            $guild_notice = input("guild_notice"); //公会公告
 
             if(!$guild_name && !$guild_image && !$guild_desc && !$guild_notice) throw new Exception("请输入要修改的内容！");
             $user_id = $this->auth->id;
@@ -221,27 +257,7 @@ class Guild extends Api
         }
     }
 
-    /**
-     * 获取搜索公会列表
-     */
-    public function getGuildList() {
-        $search = input("search","","string"); //搜索的字段 公会名称/公会ID
-        $where = [];$whereOr = [];
-        $where['status'] = 1;
-        if (!empty($search)) {
-            $whereOr['name'] = array('like', '%' . $search . '%');
-            $whereOr['g_id'] = $search;
-        }
-        $res = Db::name('guild')->field("id,g_id,user_id,party_id,name,image,desc,member")
-            ->where($where)
-            ->where(function ($query) use($whereOr) {
-                $query->whereOr($whereOr);
-            })
-            ->autopage()
-            ->select();
 
-        $this->success("获取成功！",$res);
-    }
 
     /**
      * 公会申请页面信息