diff --git a/admin/application/admin/common.php b/admin/application/admin/common.php index f3d1e99..24da5f4 100644 --- a/admin/application/admin/common.php +++ b/admin/application/admin/common.php @@ -195,3 +195,20 @@ if (!function_exists('build_heading')) { return $result; } } + + +function session_admin($key=''){ + $admin = session('admin'); + if($key){ + return $admin[$key]; + } + return $admin; +} +function session_admin_firm_id(){ + $admin = session('admin.firm_id'); + return $admin; +} +function session_admin_firmstore_id(){ + $admin = session('admin.firmstore_id'); + return $admin; +} diff --git a/admin/application/admin/controller/Dashboard.php b/admin/application/admin/controller/Dashboard.php index 75088c9..2547020 100644 --- a/admin/application/admin/controller/Dashboard.php +++ b/admin/application/admin/controller/Dashboard.php @@ -23,6 +23,7 @@ class Dashboard extends Backend */ public function index() { + //dump(session('admin')); try { \think\Db::execute("SET @@sql_mode='';"); } catch (\Exception $e) { diff --git a/admin/application/admin/controller/Firmbigcategory.php b/admin/application/admin/controller/Firmbigcategory.php index 3679f30..39874d0 100644 --- a/admin/application/admin/controller/Firmbigcategory.php +++ b/admin/application/admin/controller/Firmbigcategory.php @@ -23,6 +23,7 @@ class Firmbigcategory extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmbigcategory; + $this->model->where('firm_id',session_admin_firm_id()); } diff --git a/admin/application/admin/controller/Firmcustomer.php b/admin/application/admin/controller/Firmcustomer.php index 2ed65a8..81b9f49 100644 --- a/admin/application/admin/controller/Firmcustomer.php +++ b/admin/application/admin/controller/Firmcustomer.php @@ -4,6 +4,7 @@ namespace app\admin\controller; use app\common\controller\Backend; use think\Db; +use think\Request; /** * 企业客户信息 @@ -24,6 +25,8 @@ class Firmcustomer extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmcustomer; $this->view->assign("statusList", $this->model->getStatusList()); + $this->model->where('firmcustomer.firm_id',session_admin_firm_id()); + $this->model->where('firmcustomer.firmstore_id',session_admin_firmstore_id()); } @@ -53,7 +56,7 @@ class Firmcustomer extends Backend $list = $this->model ->with(['firmstoreprojectstwo','firmcustomerorigin','firmemployee']) - ->where($where) + ->where($where) ->order($sort, $order) ->paginate($limit); diff --git a/admin/application/admin/controller/Firmcustomerfollowuprecord.php b/admin/application/admin/controller/Firmcustomerfollowuprecord.php index 03fcaea..1dcd3ea 100644 --- a/admin/application/admin/controller/Firmcustomerfollowuprecord.php +++ b/admin/application/admin/controller/Firmcustomerfollowuprecord.php @@ -23,6 +23,8 @@ class Firmcustomerfollowuprecord extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmcustomerfollowuprecord; $this->view->assign("statusList", $this->model->getStatusList()); + $this->model->where('firm_id',session_admin_firm_id()); + $this->model->where('firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmcustomerorigin.php b/admin/application/admin/controller/Firmcustomerorigin.php index 8e9ad3a..fcd78de 100644 --- a/admin/application/admin/controller/Firmcustomerorigin.php +++ b/admin/application/admin/controller/Firmcustomerorigin.php @@ -23,6 +23,8 @@ class Firmcustomerorigin extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmcustomerorigin; + $this->model->where('firm_id',session_admin_firm_id()); + $this->model->where('firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmduty.php b/admin/application/admin/controller/Firmduty.php index fe48845..a48eebd 100644 --- a/admin/application/admin/controller/Firmduty.php +++ b/admin/application/admin/controller/Firmduty.php @@ -22,7 +22,8 @@ class Firmduty extends Backend { parent::_initialize(); $this->model = new \app\admin\model\Firmduty; - + $this->model->where('firm_id',session_admin_firm_id()); + $this->model->where('firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmemployee.php b/admin/application/admin/controller/Firmemployee.php index d0b0865..1030aee 100644 --- a/admin/application/admin/controller/Firmemployee.php +++ b/admin/application/admin/controller/Firmemployee.php @@ -24,6 +24,9 @@ class Firmemployee extends Backend $this->model = new \app\admin\model\Firmemployee; $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("employeeTypeList", $this->model->getEmployeeTypeList()); + + $this->model->where('firmemployee.firm_id',session_admin_firm_id()); + $this->model->where('firmemployee.firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmfollowuptemplate.php b/admin/application/admin/controller/Firmfollowuptemplate.php index cfbcf4e..33340f9 100644 --- a/admin/application/admin/controller/Firmfollowuptemplate.php +++ b/admin/application/admin/controller/Firmfollowuptemplate.php @@ -23,6 +23,8 @@ class Firmfollowuptemplate extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmfollowuptemplate; + $this->model->where('firmfollowuptemplate.firm_id',session_admin_firm_id()); + $this->model->where('firmfollowuptemplate.firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmnotespoints.php b/admin/application/admin/controller/Firmnotespoints.php index eaf1c42..5a149d0 100644 --- a/admin/application/admin/controller/Firmnotespoints.php +++ b/admin/application/admin/controller/Firmnotespoints.php @@ -23,6 +23,7 @@ class Firmnotespoints extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmnotespoints; + $this->model->where('firm_id',session_admin_firm_id()); } diff --git a/admin/application/admin/controller/Firmstore.php b/admin/application/admin/controller/Firmstore.php index 13287bf..58865dd 100644 --- a/admin/application/admin/controller/Firmstore.php +++ b/admin/application/admin/controller/Firmstore.php @@ -23,6 +23,7 @@ class Firmstore extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmstore; + $this->model->where('firm_id',session_admin_firm_id()); } diff --git a/admin/application/admin/controller/Firmstoreprojectsone.php b/admin/application/admin/controller/Firmstoreprojectsone.php index e12eb5d..b82cf7c 100644 --- a/admin/application/admin/controller/Firmstoreprojectsone.php +++ b/admin/application/admin/controller/Firmstoreprojectsone.php @@ -23,6 +23,8 @@ class Firmstoreprojectsone extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmstoreprojectsone; + $this->model->where('firm_id',session_admin_firm_id()); + $this->model->where('firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmstoreprojectstwo.php b/admin/application/admin/controller/Firmstoreprojectstwo.php index d4d173f..ab48622 100644 --- a/admin/application/admin/controller/Firmstoreprojectstwo.php +++ b/admin/application/admin/controller/Firmstoreprojectstwo.php @@ -22,6 +22,8 @@ class Firmstoreprojectstwo extends Backend { parent::_initialize(); $this->model = new \app\admin\model\Firmstoreprojectstwo; + $this->model->where('firm_id',session_admin_firm_id()); + $this->model->where('firmstore_id',session_admin_firmstore_id()); } diff --git a/admin/application/admin/controller/Firmtags.php b/admin/application/admin/controller/Firmtags.php index 3441bdc..bfbe9d2 100644 --- a/admin/application/admin/controller/Firmtags.php +++ b/admin/application/admin/controller/Firmtags.php @@ -22,6 +22,7 @@ class Firmtags extends Backend { parent::_initialize(); $this->model = new \app\admin\model\Firmtags; + $this->model->where('firm_id',session_admin_firm_id()); }