xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inv' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-10 10:20:18 +08:00
parent 698f532ced 6469e05176
commit 90a431015b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/InvRequisitionController.php
+6 -5
View File
@@ -47,8 +47,9 @@ class InvRequisitionController extends BaseController
{ {
try { try {
$applicant_id = $request->get('applicant_id'); $applicant_id = $request->get('applicant_id');
$uid = $request->user->uid;
$raw = $this->service->serviceList($request); $raw = $this->service->serviceList($request);
$data = $this->formatindex($raw,$applicant_id); $data = $this->formatindex($raw,$applicant_id,$uid);
// $data = $this->transformData($raw, method_exists($this, 'indexFormat') // $data = $this->transformData($raw, method_exists($this, 'indexFormat')
// ? [$this, 'indexFormat'] // ? [$this, 'indexFormat']
// : null); // : null);
@@ -58,9 +59,9 @@ class InvRequisitionController extends BaseController
} }
} }
public function formatindex($p,$applicant_id){ public function formatindex($p,$applicant_id,$uid){
$records = $p->getCollection() $records = $p->getCollection()
->map(fn($item) => $this->indexFormat($item, $applicant_id)) ->map(fn($item) => $this->indexFormat($item, $applicant_id,$uid))
->toArray(); ->toArray();
return [ return [
@@ -77,7 +78,7 @@ class InvRequisitionController extends BaseController
* @param array $data * @param array $data
* @return array * @return array
*/ */
protected function indexFormat($data, $applicant_id) protected function indexFormat($data, $applicant_id,$uid)
{ {
if (isset($data['id'])){ if (isset($data['id'])){
//$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get(); //$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
@@ -97,7 +98,7 @@ class InvRequisitionController extends BaseController
if($applicant_id != 'self' && isset($data['id'])){ //不是查询自己数据时查询是否已审核 if($applicant_id != 'self' && isset($data['id'])){ //不是查询自己数据时查询是否已审核
$approve = InvRequisitionApprove::where('requisition_id', $data['id']) $approve = InvRequisitionApprove::where('requisition_id', $data['id'])
->where('applicant_id', $applicant_id) ->where('approver_id', $uid)
->first(); ->first();
$data['action'] = $approve['action']??0; $data['action'] = $approve['action']??0;
} }