工会列表

application/api/controller/Guild.php

@@ -225,26 +225,21 @@ class Guild extends Api
      * 获取搜索公会列表
      */
     public function getGuildList() {
-        $search = $this->request->request("search","","string"); //搜索的字段 公会名称/公会ID
-        $page = $this->request->request("page",1);
-        $pageNum = $this->request->request("pageNum",10);
-        $offset = ($page-1) * $pageNum;
-        //if(!$search) $this->error("请输入要搜索的公会名称或公会ID");
-        global $whereOr;
+        $search = input("search","","string"); //搜索的字段 公会名称/公会ID
         $where = [];$whereOr = [];
         $where['status'] = 1;
         if (!empty($search)) {
             $whereOr['name'] = array('like', '%' . $search . '%');
             $whereOr['g_id'] = $search;
         }
-        $res = \app\common\model\Guild::field("id,g_id,user_id,party_id,name,image,desc,member")
+        $res = Db::name('guild')->field("id,g_id,user_id,party_id,name,image,desc,member")
             ->where($where)
-            ->where(function ($query) {
-                global $whereOr;
+            ->where(function ($query) use($whereOr) {
                 $query->whereOr($whereOr);
             })
-            ->limit($offset,$pageNum)
+            ->autopage()
             ->select();
+
         $this->success("获取成功！",$res);
     }
 
@@ -252,7 +247,7 @@ class Guild extends Api
      * 公会申请页面信息
      */
     public function guildApplyInfo() {
-        $guild_id = $this->request->request("guild_id"); //公会ID
+        $guild_id = input("guild_id"); //公会ID
         if($guild_id <= 0) $this->error("参数缺失！");
         $guildInfo = \app\common\model\Guild::alias("a")
             ->join("hx_user u","u.id = a.user_id","inner")
@@ -328,8 +323,8 @@ class Guild extends Api
      * 公会签约申请
      */
     public function guildJoinin() {
-        $join_time = $this->request->request("join_time",1); //签约时长:1=3个月,2=6个月,3=12个月
-        $guild_id = $this->request->request("guild_id"); //公会ID
+        $join_time = input("join_time",1); //签约时长:1=3个月,2=6个月,3=12个月
+        $guild_id = input("guild_id"); //公会ID
         //if(!in_array($join_time,[1,2,3]) || !$guild_id) $this->error("参数错误！");
 
         // 一个身份证号只能申请一次
@@ -392,8 +387,8 @@ class Guild extends Api
      * 公会签约申请审核
      */
     public function guildJoininExamine() {
-        $joinin_id = $this->request->request("joinin_id"); // 申请加入的申请ID
-        $is_pass = $this->request->request("is_pass"); // 是否通过:1=通过,-1=拒绝
+        $joinin_id = input("joinin_id"); // 申请加入的申请ID
+        $is_pass = input("is_pass"); // 是否通过:1=通过,-1=拒绝
         if(!in_array($is_pass,[1,-1]) || !$joinin_id) $this->error("参数错误！");
         $user_id = $this->auth->id;
         $memberfind = \app\common\model\GuildMember::where(["user_id"=>$joinin_id,"status"=>1])->find();
@@ -570,9 +565,9 @@ class Guild extends Api
      * 公会成员列表
      */
     public function guildMember() {
-        $guild_id = $this->request->request("guild_id",0,"intval"); //公会ID
-        $page = $this->request->request('page',1); // 分页
-        $pageNum = $this->request->request('pageNum',10); // 分页
+        $guild_id = input("guild_id",0,"intval"); //公会ID
+        $page = input('page',1); // 分页
+        $pageNum = input('pageNum',10); // 分页
         // 分页搜索构建
         $pageStart = ($page-1)*$pageNum;
         if($guild_id <= 0) $this->error("参数错误！");
@@ -618,7 +613,7 @@ class Guild extends Api
      * 获取公会成员信息
      */
     public function getGuildMemberInfo() {
-        $member_id = $this->request->request("member_id",0,"intval"); //公会成员ID
+        $member_id = input("member_id",0,"intval"); //公会成员ID
         if($member_id <= 0) $this->error("参数错误！");
         $memberData = model('GuildMember')->field('id,user_id')->find($member_id);
         $userService = new UserService();
@@ -687,9 +682,9 @@ class Guild extends Api
      * 公会管理-设为管理员
      */
     public function guildSetManage() {
-        $guild_id = $this->request->request("guild_id",0,"intval"); //公会ID
-        $member_user_id = $this->request->request("member_user_id",0,"intval"); //成员用户ID
-        $type = $this->request->request("type",1); // 设置类型:1=设为管理员,2=取消管理员
+        $guild_id = input("guild_id",0,"intval"); //公会ID
+        $member_user_id = input("member_user_id",0,"intval"); //成员用户ID
+        $type = input("type",1); // 设置类型:1=设为管理员,2=取消管理员
         if(!$guild_id || !$member_user_id || !in_array($type,[1,2])) $this->error("参数缺失！");
         // 先判断是否为公会会长
         $user_id = $this->auth->id;
@@ -754,8 +749,8 @@ class Guild extends Api
      * 公会管理-踢出公会
      */
     public function guildDelMember() {
-        $guild_id = $this->request->request("guild_id",0,"intval"); //公会ID
-        $member_user_id = $this->request->request("member_user_id",0,"intval"); //成员用户ID
+        $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("参数缺失！");
         // 先判断是否为公会会长
         $user_id = $this->auth->id;