Commit 435111f0 by 杨树贤

修改公用审核逻辑

parent b7e41686
......@@ -132,10 +132,14 @@ class SupplierShareApplyService
'apply_user'
])->where(function ($q) use ($departmentId) {
//当要判断申请者所在部门的时候,要审核人为空,因为审核这一步是所在部门的人审核的
$q->where('department_id', $departmentId)->where('audit_uid', 0);
// $q->where('department_id', $departmentId)->where('audit_uid', 0);
//情况有变,现在采购部老大又不在上一层了,所以直接不判断部门算了
$q->where('audit_uid', 0);
})->orWhere(function ($q) use ($departmentId) {
//当要判断申请者申请的部门的时候,要复审人为空,因为复审这一步是被申请部门的人审核的
$q->where('apply_department_id', $departmentId)->where('review_uid', 0)->where('audit_uid', '!=', 0)
// $q->where('apply_department_id', $departmentId)->where('review_uid', 0)->where('audit_uid', '!=', 0)
//情况有变,现在采购部老大又不在上一层了,所以直接不判断部门算了
$q->where('review_uid', 0)->where('audit_uid', '!=', 0)
->where('status', SupplierShareApplyModel::STATUS_NEED_REVIEW);
})->orderBy('id', 'desc');
$limit = request()->get('limit', 20);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment