diff --git a/app/common/service/InvRequisitionItemReturnService.php b/app/common/service/InvRequisitionItemReturnService.php index 5c15c74..8353c0e 100644 --- a/app/common/service/InvRequisitionItemReturnService.php +++ b/app/common/service/InvRequisitionItemReturnService.php @@ -553,15 +553,15 @@ class InvRequisitionItemReturnService $config['where']['id'] = $p['requisition_item_return_id']; break; case 'index': - if(isset($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'; +// if(isset($p['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'; break; case 'show': $config['where']['id'] = $p['id']; diff --git a/app/common/service/InvRequisitionReturnService.php b/app/common/service/InvRequisitionReturnService.php index eef5322..b9015d4 100644 --- a/app/common/service/InvRequisitionReturnService.php +++ b/app/common/service/InvRequisitionReturnService.php @@ -65,9 +65,14 @@ class InvRequisitionReturnService $config['where']['id'] = $p['requisition_item_return_id']; break; case 'index': - if(isset($p['status'])){ + if(isset($p['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'; break; case 'show':