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 15:27:22 +08:00
parent 01f49f35b2 41d968b369
commit 39e673ea1a
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/InvRequisitionItemReturnService.php
+9 -9
View File
@@ -553,15 +553,15 @@ class InvRequisitionItemReturnService
$config['where']['id'] = $p['requisition_item_return_id']; $config['where']['id'] = $p['requisition_item_return_id'];
break; break;
case 'index': case 'index':
if(isset($p['status'])){ // if(isset($p['status']) && $p['status']!=''){
$config['where']['status'] = $p['status']; // $config['where']['status'] = $p['status'];
} // }
if(isset($p['handler_id']) && $p['handler_id']=='self'){ // if(isset($p['handler_id']) && $p['handler_id']=='self'){
$config['where']['applicant_id'] = $request->user->uid; // $config['where']['applicant_id'] = $request->user->uid;
}else{ // }else{
$config['where']['handler_id'] = $request->user->uid; // $config['where']['handler_id'] = $request->user->uid;
} // }
$config['order']['id'] = 'desc'; // $config['order']['id'] = 'desc';
break; break;
case 'show': case 'show':
$config['where']['id'] = $p['id']; $config['where']['id'] = $p['id'];
app/common/service/InvRequisitionReturnService.php
+6 -1
View File
@@ -65,9 +65,14 @@ class InvRequisitionReturnService
$config['where']['id'] = $p['requisition_item_return_id']; $config['where']['id'] = $p['requisition_item_return_id'];
break; break;
case 'index': case 'index':
if(isset($p['status'])){ if(isset($p['status']) && $p['status']!=''){
$config['where']['status'] = $p['status']; $config['where']['status'] = $p['status'];
} }
if (isset($p['handler_id']) && $p['handler_id'] == 'self') {
$config['where']['applicant_id'] = $request->user->uid;
} else {
$config['where']['handler_id'] = $request->user->uid;
}
$config['order']['id'] = 'desc'; $config['order']['id'] = 'desc';
break; break;
case 'show': case 'show':