diff --git a/app/adminapi/controller/dept/DeptController.php b/app/adminapi/controller/dept/DeptController.php index 6cb11956e..18c6e9aa2 100755 --- a/app/adminapi/controller/dept/DeptController.php +++ b/app/adminapi/controller/dept/DeptController.php @@ -106,14 +106,14 @@ class DeptController extends BaseAdminController if(empty($params['org_id'])){ return $this->fail('参数错误'); } - $data = Dept::field('id,name,mobile,status')->where('org_id',$params['org_id'])->select()->toArray(); + $data = Dept::field('id,name,mobile,status')->where('org_id',$params['org_id'])->where('status',0)->select()->toArray(); return $this->success('请求成功',$data); } //获取所有部门 public function getAllDept(): \think\response\Json { - $data = Dept::field('id,name,org_id')->select()->each(function($item){ + $data = Dept::field('id,name,org_id')->where('status',0)->select()->each(function($item){ $org = Orgs::field('name')->where('id',$item['org_id'])->findOrEmpty(); $item['org_name'] = $org->isEmpty() ? '' : $org['name']; $item['admin_num'] = Admin::where('dept_id',$item['id'])->count(); diff --git a/app/adminapi/controller/dept/JobsController.php b/app/adminapi/controller/dept/JobsController.php index 807570e75..442b4196c 100755 --- a/app/adminapi/controller/dept/JobsController.php +++ b/app/adminapi/controller/dept/JobsController.php @@ -107,14 +107,14 @@ class JobsController extends BaseAdminController if(empty($params['dept_id'])){ return $this->fail('参数错误'); } - $data = Jobs::field('id,name,status,sort,create_time')->where('dept_id',$params['dept_id'])->select()->toArray(); + $data = Jobs::field('id,name,status,sort,create_time')->where('dept_id',$params['dept_id'])->where('status',0)->select()->toArray(); return $this->success('请求成功',$data); } //获取所有岗位 public function getAllJobs(): \think\response\Json { - $data = Jobs::field('id,name')->select()->each(function($item){ + $data = Jobs::field('id,name')->where('status',0)->select()->each(function($item){ $item['admin_num'] = Admin::where('job_id',$item['id'])->count(); return $item; })->toArray(); diff --git a/app/adminapi/controller/dept/OrgsController.php b/app/adminapi/controller/dept/OrgsController.php index b93a25cc3..6ad6db12e 100644 --- a/app/adminapi/controller/dept/OrgsController.php +++ b/app/adminapi/controller/dept/OrgsController.php @@ -108,7 +108,7 @@ class OrgsController extends BaseAdminController //获取所有组织 public function getAll(): \think\response\Json { - $data = Orgs::field('id,name,status,create_time')->select(); + $data = Orgs::field('id,name,status,create_time')->where('status',0)->select(); return $this->success('请求成功',$data->toArray()); } } \ No newline at end of file