Browse Source

优化检测结果显示

huangsanjia 2 years ago
parent
commit
f05dd1c5ae

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

@@ -63,6 +63,7 @@ class Res extends Backend
             $userinfo = Db::name('admin')->where('id',$user_id)->find();
             $pidList = Db::name('company')->where('pid',$userinfo['company'])->select();
             $map = [];
+            $map['delete_time'] = null;
             if (!empty($pidList)){//总公司
                 $pid = [];
                 foreach ($pidList as $key=>$value){

+ 2 - 1
application/admin/controller/auth/Admin.php

@@ -239,11 +239,12 @@ class Admin extends Backend
             $groupids[] = $v['id'];
         }
         $user_id = Session::get('admin')['id'];
-        $company = Db::name('company')->where('user_id',$user_id)->select();
+        $company = Db::name('company')->where('pid',Session::get('admin')['company'])->select();
         $list = [];
         foreach ($company as $key=>$value){
             $list[$value['id']] = $value['name'];
         }
+
         $this->view->assign("company", $list);
         $this->view->assign("row", $row);
         $this->view->assign("groupids", $groupids);