工会管理接口修改

2025-11-18 09:56:41 +08:00
parent ada9cd495e
commit 92f047756b
6 changed files with 538 additions and 15 deletions
--- a/application/guildAdmin/controller/Admin.php
+++ b/application/guildAdmin/controller/Admin.php
@@ -92,6 +92,24 @@ class Admin extends GuildAdmin
        $this->grouplist = $groupList;
        $this->groupdata = $groupName;
        $this->assignconfig("admin", ['id' => $this->auth->id, 'group_ids' => $this->auth->getGroupIds()]);
+
+        $ruleList = db::name("vs_guild_admin_auth")->field('type,condition,remark,createtime,updatetime', true)->order('weigh DESC,id ASC')->select();
+        foreach ($ruleList as $k => &$v) {
+            $v['title'] = __($v['title']);
+        }
+
+        unset($v);
+        Tree::instance()->init($ruleList);
+        $this->rulelist = Tree::instance()->getTreeArray(0);
+        $ruledata = [0 => __('None')];
+        foreach ($this->rulelist as $k => &$v) {
+            if (!$v['ismenu']) {
+                continue;
+            }
+            $ruledata[$v['id']] = $v['title'];
+            unset($v['spacer']);
+        }
+        unset($v);
    }

    /**
@@ -217,6 +235,30 @@ class Admin extends GuildAdmin
        return  V(1,"系统菜单接口", $ruleList);
    }

+    public function getTree($ruleList,$fieldData=[]){
+        $ruledata = [];
+        $i= 0;
+        foreach ($ruleList as $k => &$v) {
+            if (!$v['ismenu']) {
+                continue;
+            }
+            if(!$this->auth->check($v['name'])){
+                continue;
+            }
+            foreach ($fieldData as $key => $value) {
+                $ruledata[$i][$value] = $v[$value];
+            }
+            if(!empty($v['childlist'])){
+                $ruledata[$i]['childlist'] = $this->getTree($v['childlist'],$fieldData);
+                if(empty($ruledata[$i]['childlist'])){
+                    unset($ruledata[$i]['childlist']);
+                }
+            }
+            $i++;
+        }
+        return $ruledata;
+    }
+

    /**
     * 角色列表
--- a/application/guildAdmin/controller/Statistical.php
+++ b/application/guildAdmin/controller/Statistical.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace app\guildAdmin\controller;
+
+use app\admin\command\Menu;
+use app\GuildAdmin\model\AuthGroup;
+use app\GuildAdmin\model\AuthGroupAccess;
+use app\GuildAdmin\model\AuthRule;
+use app\common\controller\GuildAdmin;
+use fast\Random;
+use fast\Tree;
+use think\Cache;
+use think\Db;
+use think\Exception;
+use think\Hook;
+use think\Session;
+use think\Validate;
+
+/**
+ * 管理员管理
+ *
+ * @icon   fa fa-users
+ * @remark 一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成
+ */
+class Statistical extends GuildAdmin
+{
+
+    protected $noNeedLogin = [];
+    protected $noNeedRight = [];
+    protected $layout = '';
+    protected $table_guild_subsidy_config = 'vs_guild_subsidy_config';
+    protected $table_guild_subsidy = 'vs_guild_subsidy';
+    protected $table_guild_user = 'vs_guild_user';
+    protected $table_guild_data = 'vs_guild_data';
+    protected $table_guild = 'vs_guild';
+    public function _initialize()
+    {
+        parent::_initialize();
+    }
+
+    //用户申请列表
+    public function user_lists(){
+        $guild_id = $this->guildId;
+        $page = input('page', 1);
+        $page_limit = input('page_limit', 30);
+        $search_user_id = input('user_id', '');
+       $stime = input('stime', '');
+       $etime = input('etime', '');
+       $where = [];
+       $where['a.guild_id'] = $guild_id;
+       if ($search_user_id) {
+           $user_id = db::name('user')->where('user_code', $search_user_id)->value('id');
+           $where['a.user_id'] = $user_id;
+       }
+       if ($stime) {
+           $where['a.create_time'] = ['>=', $stime];
+       }
+       if ($etime) {
+           $where['a.create_time'] = ['<=', $etime];
+       }
+       $count = Db::name($this->table_guild_user)->alias('a')
+           ->join('user b', 'a.user_id = b.id')
+           ->where($where)
+           ->where('a.status', 1)->count();
+        $lists = Db::name($this->table_guild_user)->alias('a')
+            ->join('user b', 'a.user_id = b.id')
+            ->field('a.id,a.user_id,a.status,a.createtime,a.apply_time,b.user_code,b.nickname')
+            ->where($where)
+            ->where('a.status', 1)
+            ->order('a.id desc')
+            ->page($page, $page_limit)
+            ->select();
+        $lists_data = [];
+        foreach ($lists as $key => $value) {
+            $lists_data[$key] = $value;
+            $lists_data[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
+        }
+        $return_data = [
+            'page' =>$page,
+            'page_limit' => $page_limit,
+            'count' => $count,
+            'lists' => $lists_data
+        ];
+        return V(1,"成功", $return_data);
+    }
+
+    //房间数据统计
+    public function room_lists(){
+        $guild_id = $this->guildId;
+        $page = input('page', 1);
+        $page_limit = input('page_limit', 30);
+        $search_room_id = input('room_id', '');
+        $stime = input('stime', '');
+        $etime = input('etime', '');
+        $where = [];
+        $where['a.guild_id'] = $guild_id;
+        if ($search_room_id) {
+            $where['b.room_number'] = $search_room_id;
+        }
+        $search_stime = '';
+        $search_etime = '';
+        if ($stime) {
+            $where['a.create_time'] = ['>=', $stime];
+            $search_stime = strtotime($stime);
+        }
+        if ($etime) {
+            $where['a.create_time'] = ['<=', $etime];
+            $search_etime = strtotime($etime);
+        }
+        $count = Db::name($this->table_guild_user)->alias('a')
+            ->join('vs_room b', 'a.room_id = b.id')
+            ->where($where)
+            ->where('a.status', 1)->count();
+            $lists = Db::name($this->table_guild_user)->alias('a')
+                ->join('vs_room b', 'a.room_id = b.id')
+                ->field('a.id,a.room_id,a.status,a.createtime,a.apply_time,b.room_number,b.room_name')
+                ->where($where)
+                ->where('a.status', 1)
+                ->order('a.id desc')
+                ->page($page, $page_limit)
+                ->select();
+            $lists_data = [];
+            foreach ($lists as $key => $value) {
+                $lists_data[$key]['room_number'] = $value['room_number'];
+                $lists_data[$key]['room_name'] = $value['room_name'];
+                //送礼流水
+                $lists_data[$key]['consumption']= model('adminapi/Room')->getRoomFlow($value['room_id'],$search_stime,$search_etime);
+                //绩效流水
+
+                //送礼人数
+                $lists_data[$key]['gift_num'] = db::name('vs_give_gift')->where(['from_id'=>$value['room_id'],'from'=>2])->count();
+                $lists_data[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
+            }
+            $return_data = [
+                'page' =>$page,
+                'page_limit' => $page_limit,
+                'count' => $count,
+                'lists' => $lists_data
+            ];
+            return V(1,"成功", $return_data);
+    }
+}
--- a/application/guildAdmin/controller/SystemMessage.php
+++ b/application/guildAdmin/controller/SystemMessage.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace app\guildAdmin\controller;
+
+use app\admin\command\Menu;
+use app\GuildAdmin\model\AuthGroup;
+use app\GuildAdmin\model\AuthGroupAccess;
+use app\GuildAdmin\model\AuthRule;
+use app\common\controller\GuildAdmin;
+use fast\Random;
+use fast\Tree;
+use think\Cache;
+use think\Db;
+use think\Exception;
+use think\Hook;
+use think\Session;
+use think\Validate;
+
+/**
+ * 管理员管理
+ *
+ * @icon   fa fa-users
+ * @remark 一个管理员可以有多个角色组,左侧的菜单根据管理员所拥有的权限进行生成
+ */
+class SystemMessage extends GuildAdmin
+{
+
+    protected $noNeedLogin = [];
+    protected $noNeedRight = [];
+    protected $layout = '';
+    protected $table_guild_subsidy_config = 'vs_guild_subsidy_config';
+    protected $table_guild_subsidy = 'vs_guild_subsidy';
+    protected $table_guild_user = 'vs_guild_user';
+    protected $table_guild_data = 'vs_guild_data';
+    protected $table_guild = 'vs_guild';
+    public function _initialize()
+    {
+        parent::_initialize();
+    }
+
+    //用户申请列表
+    public function message_lists(){
+        $guild_id = $this->guildId;
+        $page = input('page', 1);
+        $page_limit = input('page_limit', 30);
+        $where['delete_time'] = 0;
+        $where['receiving_id'] = $guild_id;
+        $count = db::name('system_message')->where($where)->count();
+        $lists = db::name('system_message')->where($where)->page($page, $page_limit)->select();
+
+        $lists_data =[];
+        foreach ($lists as $key => $value) {
+            $lists_data[$key]['title'] = $value['title'];
+            $lists_data[$key]['content'] = $value['content'];
+            $lists_data[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
+            $lists_data[$key]['type_name'] = $value['type'] == 1 ? '系统消息' : '官方公告';
+            $lists_data[$key]['admin_name'] = db::name('admin')->where('id', $value['admin_id'])->value('nickname');
+            //提醒方式：1 站内 2短信
+            $lists_data[$key]['remind_type_str'] = $value['remind_type'] == 1 ? '站内' : '短信';
+
+        }
+        $return_data = [
+            'page' =>$page,
+            'page_limit' => $page_limit,
+            'count' => $count,
+            'lists' => $lists_data
+        ];
+        return V(1,"成功", $return_data);
+    }
+}
--- a/application/guildAdmin/library/Auth.php
+++ b/application/guildAdmin/library/Auth.php
@@ -13,7 +13,7 @@ use think\Hook;
 use think\Request;
 use think\Session;

-class Auth extends \fast\Auth
+class Auth extends \fast\GuildaAuth
 {
    protected $_error = '';
    protected $requestUri = '';
@@ -320,22 +320,25 @@ class Auth extends \fast\Auth
    public function getRuleIds($uid = null)
    {
        $uid = is_null($uid) ? $this->id : $uid;
-//        return parent::getRuleIds($uid);
        // 执行查询
-        $user_groups = Db::name('vs_guild_admin_auth_group_access')
-            ->alias('aga')
-            ->join('fa_vs_guild_admin_auth_group ag', 'aga.group_id = ag.id', 'LEFT')
-            ->field('aga.uid,aga.group_id,ag.id,ag.pid,ag.name,ag.rules')
-            ->where("aga.uid='{$uid}' and ag.status='normal'")
-            ->where('ag.guild_id', Session::get('guild_id'))
-            ->select();
-        $groups[$uid] = $user_groups ?: [];
-        $ids = []; //保存用户所属用户组设置的所有权限规则id
-        foreach ($groups[$uid] as $g) {
-            $ids = array_merge($ids, explode(',', trim($g['rules'], ',')));
+        if($uid==1){
+            return parent::getRuleIds($uid);
+        }else{
+            $user_groups = Db::name('vs_guild_admin_auth_group_access')
+                ->alias('aga')
+                ->join('fa_vs_guild_admin_auth_group ag', 'aga.group_id = ag.id', 'LEFT')
+                ->field('aga.uid,aga.group_id,ag.id,ag.pid,ag.name,ag.rules')
+                ->where("aga.uid='{$uid}' and ag.status='normal'")
+                ->where('ag.guild_id', Session::get('guild_id'))
+                ->select();
+            $groups[$uid] = $user_groups ?: [];
+            $ids = []; //保存用户所属用户组设置的所有权限规则id
+            foreach ($groups[$uid] as $g) {
+                $ids = array_merge($ids, explode(',', trim($g['rules'], ',')));
+            }
+            $ids = array_unique($ids);
+            return $ids;
        }
-        $ids = array_unique($ids);
-        return $ids;
    }

    public function isSuperAdmin()