mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

选择部门负责人是可以选择子部门的人，首页读取统计数据优化

Browse Source
This commit is contained in:
hdm 2022-09-21 23:06:15 +08:00
parent 668dd7aba4
commit ccdd2d236b
3 changed files with 66 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common.php
View File

@ -247,7 +247,7 @@ function get_department_role($uid = 0)
$did = get_admin($uid)['did'];
//判断是否是部门负责人
$is_leader = Db::name('Department')->where(['id' => $did,'leader_id'=>$uid])->count();
if($is_leader=0){
if($is_leader==0){
return [];
}
else{

63
app/home/controller/Index.php
View File

@ -147,14 +147,49 @@ class Index extends BaseController
$module = Db::name('AdminModule')->column('name');
if (in_array('customer', $module)) {
$customerCount = Db::name('Customer')->where([['delete_time', '=', 0]])->count();
$whereCustomer = array();
$whereCustomerOr = array();
$uid = $this->uid;
$dids = get_department_role($uid);
$whereCustomer[] = ['delete_time', '=', 0];
$whereCustomerOr[] =['belong_uid', '=', $uid];
if(!empty($dids)){
$whereCustomerOr[] =['belong_did', 'in', $dids];
}
$whereCustomerOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',share_ids)")];
$customerCount = Db::name('Customer')->where($whereCustomer)
->where(function ($query) use($whereCustomerOr) {
$query->whereOr($whereCustomerOr);
})
->count();
$total[] = array(
'name' => '客户',
'num' => $customerCount,
);
}
if (in_array('contract', $module)) {
$contractCount = Db::name('Contract')->where([['delete_time', '=', 0]])->count();
$whereContract = array();
$whereContractOr = array();
$uid = $this->uid;
$whereContract[] = ['delete_time', '=', 0];
$whereContractOr[] =['admin_id|prepared_uid|sign_uid|keeper_uid', '=', $uid];
$whereContractOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',share_ids)")];
$whereContractOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',check_admin_ids)")];
$whereContractOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',flow_admin_ids)")];
$dids = get_department_role($uid);
if(!empty($dids)){
$whereContractOr[] =['sign_did', 'in', $dids];
}
$contractCount = Db::name('Contract')->where($whereContract)
->where(function ($query) use($whereContractOr) {
$query->whereOr($whereContractOr);
})
->count();
$total[] = array(
'name' => '合同',
'num' => $contractCount,
@ -162,8 +197,26 @@ class Index extends BaseController
$handle['contract'] = Db::name('Contract')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count();
}
if (in_array('project', $module)) {
$projectCount = Db::name('Project')->where([['delete_time', '=', 0]])->count();
$taskCount = Db::name('ProjectTask')->where([['delete_time', '=', 0]])->count();
$project_ids = Db::name('ProjectUser')->where(['uid' => $this->uid, 'delete_time' => 0])->column('project_id');
$whereProject = [];
$whereProject[] = ['delete_time', '=', 0];
$whereProject[] = ['id', 'in', $project_ids];
$projectCount = Db::name('Project')->where($whereProject)->count();
$map1 = [];
$map2 = [];
$map3 = [];
$map4 = [];
$uid = $this->uid;
$map1[] = ['admin_id', '=', $uid];
$map2[] = ['director_uid', '=', $uid];
$map3[] = ['', 'exp', Db::raw("FIND_IN_SET({$uid},assist_admin_ids)")];
$map4[] = ['project_id', 'in', $project_ids];
$taskCount = Db::name('ProjectTask')->where([['delete_time', '=', 0]])->where(function ($query) use ($map1, $map2, $map3, $map4) {
$query->where($map1)->whereor($map2)->whereor($map3)->whereor($map4);
})->count();
$total[] = array(
'name' => '项目',
'num' => $projectCount,
@ -175,7 +228,7 @@ class Index extends BaseController
$handle['task'] = Db::name('ProjectTask')->where([['director_uid', '=', $this->uid],['delete_time', '=', 0]])->count();
}
if (in_array('article', $module)) {
$articleCount = Db::name('Article')->where([['delete_time', '=', 0]])->count();
$articleCount = Db::name('Article')->where([['delete_time', '=', 0],['uid', '=', $this->uid]])->count();
$total[] = array(
'name' => '文章',
'num' => $articleCount,

8
app/user/controller/Department.php
View File

@ -70,7 +70,13 @@ class Department extends BaseController
$department = set_recursion(get_department());
if ($id > 0) {
$detail = Db::name('Department')->where(['id' => $id])->find();
$users = Db::name('Admin')->where(['did' => $id, 'status' => 1])->select();
//获取子部门
$department = get_department();
$department_list = get_data_node($department, $id);
$department_array = array_column($department_list, 'id');
//包括自己部门在内
$department_array[] = $id;
$users = Db::name('Admin')->where([['did','in',$department_array], ['status','=',1]])->select();
View::assign('users', $users);
View::assign('detail', $detail);
}