Browse Source

优化权限

huangsanjia 2 years ago
parent
commit
50e64346cf
2 changed files with 55 additions and 0 deletions
  1. 2 0
      application/admin/controller/Entrust.php
  2. 53 0
      application/admin/controller/Res.php

+ 2 - 0
application/admin/controller/Entrust.php

@@ -383,6 +383,8 @@ class Entrust extends Backend
         $params['params'] = Db::name('item_judge')->where('id',$temp_id)->value('list_name');
         $params['params'] = Db::name('item_judge')->where('id',$temp_id)->value('list_name');
         $params['userid'] = Session::get('admin')['id'];;
         $params['userid'] = Session::get('admin')['id'];;
         $params['status'] = 0;
         $params['status'] = 0;
+        $params['work_unit'] = $entrust['work_unit'];
+        $params['work_name'] = $entrust['work_name'];
         //更新数据
         //更新数据
         $entrust_update = [];
         $entrust_update = [];
         $entrust_update['standard_id'] =$temp_id;
         $entrust_update['standard_id'] =$temp_id;

+ 53 - 0
application/admin/controller/Res.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 
 use app\common\controller\Backend;
 use app\common\controller\Backend;
 use \think\Db;
 use \think\Db;
+use \think\Session;
 /**
 /**
  * 检测结果管理管理
  * 检测结果管理管理
  *
  *
@@ -32,6 +33,58 @@ class Res extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
      */
+    /**
+     * 查看
+     *
+     * @return string|Json
+     * @throws \think\Exception
+     * @throws DbException
+     */
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage,则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $user_id = Session::get('admin')['id'];
+        if ($user_id == 1){//超级管理员
+            $list = $this->model
+                ->where($where)
+                ->order($sort, $order)
+                ->paginate($limit);
+        }else{
+            $userinfo = Db::name('admin')->where('id',$user_id)->find();
+            $pidList = Db::name('company')->where('pid',$userinfo['company'])->select();
+            $map = [];
+            if (!empty($pidList)){//总公司
+                $pid = [];
+                foreach ($pidList as $key=>$value){
+                    $pid[$key] = $value['id'];
+                }
+                $map['work_unit'] = array('in',$pid);
+            }else{//分公司
+                $map['work_unit'] = $userinfo['company'];
+            }
+            $list = $this->model
+                ->where($where)
+                ->where($map)
+                ->order($sort, $order)
+                ->paginate($limit);
+        }
+
+
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+
+
+
     //检测数据查看
     //检测数据查看
     public function data(){
     public function data(){
         $params = input('id');
         $params = input('id');